1 files changed, 26 insertions, 8 deletions

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 646bc36b4d1b..8bd74558c0e4 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -309,10 +309,27 @@ struct vm_fault {
                                          * VM_FAULT_DAX_LOCKED and fill in
                                          * entry here.
                                          */
-        /* for ->map_pages() only */
-        pgoff_t max_pgoff;              /* map pages for offset from pgoff till
-                                         * max_pgoff inclusive */
-        pte_t *pte;                     /* pte entry associated with ->pgoff */
+};
+
+/*
+ * Page fault context: passes though page fault handler instead of endless list
+ * of function arguments.
+ */
+struct fault_env {
+        struct vm_area_struct *vma;     /* Target VMA */
+        unsigned long address;          /* Faulting virtual address */
+        unsigned int flags;             /* FAULT_FLAG_xxx flags */
+        pmd_t *pmd;                     /* Pointer to pmd entry matching
+                                         * the 'address'
+                                         */
+        pte_t *pte;                     /* Pointer to pte entry matching
+                                         * the 'address'. NULL if the page
+                                         * table hasn't been allocated.
+                                         */
+        spinlock_t *ptl;                /* Page table lock.
+                                         * Protects pte page table if 'pte'
+                                         * is not NULL, otherwise pmd.
+                                         */
 };
 
 /*
@@ -327,7 +344,8 @@ struct vm_operations_struct {
         int (*fault)(struct vm_area_struct *vma, struct vm_fault *vmf);
         int (*pmd_fault)(struct vm_area_struct *, unsigned long address,
                                                 pmd_t *, unsigned int flags);
-        void (*map_pages)(struct vm_area_struct *vma, struct vm_fault *vmf);
+        void (*map_pages)(struct fault_env *fe,
+                        pgoff_t start_pgoff, pgoff_t end_pgoff);
 
         /* notification that a previously read-only page is about to become
          * writable, if an error is returned it will cause a SIGBUS */
@@ -600,8 +618,7 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma)
         return pte;
 }
 
-void do_set_pte(struct vm_area_struct *vma, unsigned long address,
-                struct page *page, pte_t *pte, bool write, bool anon);
+void do_set_pte(struct fault_env *fe, struct page *page);
 #endif
 
 /*
@@ -2062,7 +2079,8 @@ extern void truncate_inode_pages_final(struct address_space *);
 
 /* generic vm_area_ops exported for stackable file systems */
 extern int filemap_fault(struct vm_area_struct *, struct vm_fault *);
-extern void filemap_map_pages(struct vm_area_struct *vma, struct vm_fault *vmf);
+extern void filemap_map_pages(struct fault_env *fe,
+                pgoff_t start_pgoff, pgoff_t end_pgoff);
 extern int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf);
 
 /* mm/page-writeback.c */