mm, dax: change pmd_fault() to take only vmf parameter

pmd_fault() and related functions really only need the vmf parameter since
the additional parameters are all included in the vmf struct.  Remove the
additional parameter and simplify pmd_fault() and friends.

Link: http://lkml.kernel.org/r/1484085142-2297-8-git-send-email-ross.zwisler@linux.intel.com
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 4 insertions, 5 deletions

diff --git a/mm/memory.c b/mm/memory.c
index 2376f8528800..ececdc4a2892 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3471,11 +3471,10 @@ out:
 
 static int create_huge_pmd(struct vm_fault *vmf)
 {
-        struct vm_area_struct *vma = vmf->vma;
-        if (vma_is_anonymous(vma))
+        if (vma_is_anonymous(vmf->vma))
                 return do_huge_pmd_anonymous_page(vmf);
-        if (vma->vm_ops->pmd_fault)
-                return vma->vm_ops->pmd_fault(vma, vmf);
+        if (vmf->vma->vm_ops->pmd_fault)
+                return vmf->vma->vm_ops->pmd_fault(vmf);
         return VM_FAULT_FALLBACK;
 }
 
@@ -3484,7 +3483,7 @@ static int wp_huge_pmd(struct vm_fault *vmf, pmd_t orig_pmd)
         if (vma_is_anonymous(vmf->vma))
                 return do_huge_pmd_wp_page(vmf, orig_pmd);
         if (vmf->vma->vm_ops->pmd_fault)
-                return vmf->vma->vm_ops->pmd_fault(vmf->vma, vmf);
+                return vmf->vma->vm_ops->pmd_fault(vmf);
 
         /* COW handled on pte level: split pmd */
         VM_BUG_ON_VMA(vmf->vma->vm_flags & VM_SHARED, vmf->vma);