1 files changed, 14 insertions, 16 deletions

diff --git a/fs/ocfs2/mmap.c b/fs/ocfs2/mmap.c
index cd75508b1c8a..ee64749e2eeb 100644
--- a/fs/ocfs2/mmap.c
+++ b/fs/ocfs2/mmap.c
@@ -60,30 +60,28 @@ static inline int ocfs2_vm_op_unblock_sigs(sigset_t *oldset)
         return sigprocmask(SIG_SETMASK, oldset, NULL);
 }
 
-static struct page *ocfs2_fault(struct vm_area_struct *area,
-                                                struct fault_data *fdata)
+static int ocfs2_fault(struct vm_area_struct *area, struct vm_fault *vmf)
 {
-        struct page *page = NULL;
         sigset_t blocked, oldset;
-        int ret;
+        int error, ret;
 
-        mlog_entry("(area=%p, page offset=%lu)\n", area, fdata->pgoff);
+        mlog_entry("(area=%p, page offset=%lu)\n", area, vmf->pgoff);
 
-        ret = ocfs2_vm_op_block_sigs(&blocked, &oldset);
-        if (ret < 0) {
-                fdata->type = VM_FAULT_SIGBUS;
-                mlog_errno(ret);
+        error = ocfs2_vm_op_block_sigs(&blocked, &oldset);
+        if (error < 0) {
+                mlog_errno(error);
+                ret = VM_FAULT_SIGBUS;
                 goto out;
         }
 
-        page = filemap_fault(area, fdata);
+        ret = filemap_fault(area, vmf);
 
-        ret = ocfs2_vm_op_unblock_sigs(&oldset);
-        if (ret < 0)
-                mlog_errno(ret);
+        error = ocfs2_vm_op_unblock_sigs(&oldset);
+        if (error < 0)
+                mlog_errno(error);
 out:
-        mlog_exit_ptr(page);
-        return page;
+        mlog_exit_ptr(vmf->page);
+        return ret;
 }
 
 static int __ocfs2_page_mkwrite(struct inode *inode, struct buffer_head *di_bh,
@@ -225,7 +223,7 @@ int ocfs2_mmap(struct file *file, struct vm_area_struct *vma)
         ocfs2_meta_unlock(file->f_dentry->d_inode, lock_level);
 out:
         vma->vm_ops = &ocfs2_file_vm_ops;
-        vma->vm_flags |= VM_CAN_INVALIDATE | VM_CAN_NONLINEAR;
+        vma->vm_flags |= VM_CAN_NONLINEAR;
         return 0;
 }