1 files changed, 21 insertions, 19 deletions

diff --git a/fs/ncpfs/mmap.c b/fs/ncpfs/mmap.c
index 70a69115500f..a94473d3072c 100644
--- a/fs/ncpfs/mmap.c
+++ b/fs/ncpfs/mmap.c
@@ -24,31 +24,35 @@
 
 /*
  * Fill in the supplied page for mmap
+ * XXX: how are we excluding truncate/invalidate here? Maybe need to lock
+ * page?
  */
-static struct page* ncp_file_mmap_nopage(struct vm_area_struct *area,
-                                     unsigned long address, int *type)
+static int ncp_file_mmap_fault(struct vm_area_struct *area,
+                                        struct vm_fault *vmf)
 {
         struct file *file = area->vm_file;
         struct dentry *dentry = file->f_path.dentry;
         struct inode *inode = dentry->d_inode;
-        struct page* page;
         char *pg_addr;
         unsigned int already_read;
         unsigned int count;
         int bufsize;
-        int pos;
+        int pos; /* XXX: loff_t ? */
 
-        page = alloc_page(GFP_HIGHUSER); /* ncpfs has nothing against high pages
-                   as long as recvmsg and memset works on it */
-        if (!page)
-                return page;
-        pg_addr = kmap(page);
-        address &= PAGE_MASK;
-        pos = address - area->vm_start + (area->vm_pgoff << PAGE_SHIFT);
+        /*
+         * ncpfs has nothing against high pages as long
+         * as recvmsg and memset works on it
+         */
+        vmf->page = alloc_page(GFP_HIGHUSER);
+        if (!vmf->page)
+                return VM_FAULT_OOM;
+        pg_addr = kmap(vmf->page);
+        pos = vmf->pgoff << PAGE_SHIFT;
 
         count = PAGE_SIZE;
-        if (address + PAGE_SIZE > area->vm_end) {
-                count = area->vm_end - address;
+        if ((unsigned long)vmf->virtual_address + PAGE_SIZE > area->vm_end) {
+                WARN_ON(1); /* shouldn't happen? */
+                count = area->vm_end - (unsigned long)vmf->virtual_address;
         }
         /* what we can read in one go */
         bufsize = NCP_SERVER(inode)->buffer_size;
@@ -83,23 +87,21 @@ static struct page* ncp_file_mmap_nopage(struct vm_area_struct *area,
 
         if (already_read < PAGE_SIZE)
                 memset(pg_addr + already_read, 0, PAGE_SIZE - already_read);
-        flush_dcache_page(page);
-        kunmap(page);
+        flush_dcache_page(vmf->page);
+        kunmap(vmf->page);
 
         /*
          * If I understand ncp_read_kernel() properly, the above always
          * fetches from the network, here the analogue of disk.
          * -- wli
          */
-        if (type)
-                *type = VM_FAULT_MAJOR;
         count_vm_event(PGMAJFAULT);
-        return page;
+        return VM_FAULT_MAJOR;
 }
 
 static struct vm_operations_struct ncp_file_mmap =
 {
-        .nopage = ncp_file_mmap_nopage,
+        .fault = ncp_file_mmap_fault,
 };