lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ieee1394: nopage

Browse Source 
Convert ieee1394 from nopage to fault.
Remove redundant vma range checks (correct resource range check is retained).

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Nick Piggin
2007-12-05 18:15:53 +11:00
committed by Stefan Richter
parent a5c52df8bc
commit 61db81214b
1 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/ieee1394/dma.c
View File

@@ -231,37 +231,32 @@ void dma_region_sync_for_device(struct dma_region *dma, unsigned long offset,
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
/* nopage() handler for mmap access */ /* fault() handler for mmap access */
static struct page *dma_region_pagefault(struct vm_area_struct *area, static int dma_region_pagefault(struct vm_area_struct *vma,
unsigned long address, int *type) struct vm_fault *vmf)
{ {
unsigned long offset;
unsigned long kernel_virt_addr; unsigned long kernel_virt_addr;
struct page *ret = NOPAGE_SIGBUS;
struct dma_region *dma = (struct dma_region *)area->vm_private_data; struct dma_region *dma = (struct dma_region *)vma->vm_private_data;
if (!dma->kvirt) if (!dma->kvirt)
goto out; goto error;
if ((address < (unsigned long)area->vm_start) || if (vmf->pgoff >= dma->n_pages)
(address > goto error;
(unsigned long)area->vm_start + (dma->n_pages << PAGE_SHIFT)))
goto out;
if (type) kernel_virt_addr = (unsigned long)dma->kvirt + (vmf->pgoff << PAGE_SHIFT);
*type = VM_FAULT_MINOR; vmf->page = vmalloc_to_page((void *)kernel_virt_addr);
offset = address - area->vm_start; get_page(vmf->page);
kernel_virt_addr = (unsigned long)dma->kvirt + offset; return 0;
ret = vmalloc_to_page((void *)kernel_virt_addr);
get_page(ret); error:
out: return VM_FAULT_SIGBUS;
return ret;
} }
static struct vm_operations_struct dma_region_vm_ops = { static struct vm_operations_struct dma_region_vm_ops = {
.nopage = dma_region_pagefault, .fault = dma_region_pagefault,
}; };
/** /**
@@ -275,7 +270,7 @@ int dma_region_mmap(struct dma_region *dma, struct file *file,
if (!dma->kvirt) if (!dma->kvirt)
return -EINVAL; return -EINVAL;
/* must be page-aligned */ /* must be page-aligned (XXX: comment is wrong, we could allow pgoff) */
if (vma->vm_pgoff != 0) if (vma->vm_pgoff != 0)
return -EINVAL; return -EINVAL;