1 files changed, 14 insertions, 12 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 416d563468a3..1944c631e3e6 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1008,9 +1008,12 @@ void page_endio(struct page *page, bool is_write, int err)
                 unlock_page(page);
         } else {
                 if (err) {
+                        struct address_space *mapping;
+
                         SetPageError(page);
-                        if (page->mapping)
-                                mapping_set_error(page->mapping, err);
+                        mapping = page_mapping(page);
+                        if (mapping)
+                                mapping_set_error(mapping, err);
                 }
                 end_page_writeback(page);
         }
@@ -2169,7 +2172,6 @@ static void do_async_mmap_readahead(struct vm_area_struct *vma,
 
 /**
  * filemap_fault - read in file data for page fault handling
- * @vma:        vma in which the fault was taken
  * @vmf:        struct vm_fault containing details of the fault
  *
  * filemap_fault() is invoked via the vma operations vector for a
@@ -2191,10 +2193,10 @@ static void do_async_mmap_readahead(struct vm_area_struct *vma,
  *
  * We never return with VM_FAULT_RETRY and a bit from VM_FAULT_ERROR set.
  */
-int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+int filemap_fault(struct vm_fault *vmf)
 {
         int error;
-        struct file *file = vma->vm_file;
+        struct file *file = vmf->vma->vm_file;
         struct address_space *mapping = file->f_mapping;
         struct file_ra_state *ra = &file->f_ra;
         struct inode *inode = mapping->host;
@@ -2216,12 +2218,12 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                  * We found the page, so try async readahead before
                  * waiting for the lock.
                  */
-                do_async_mmap_readahead(vma, ra, file, page, offset);
+                do_async_mmap_readahead(vmf->vma, ra, file, page, offset);
         } else if (!page) {
                 /* No page in the page cache at all */
-                do_sync_mmap_readahead(vma, ra, file, offset);
+                do_sync_mmap_readahead(vmf->vma, ra, file, offset);
                 count_vm_event(PGMAJFAULT);
-                mem_cgroup_count_vm_event(vma->vm_mm, PGMAJFAULT);
+                mem_cgroup_count_vm_event(vmf->vma->vm_mm, PGMAJFAULT);
                 ret = VM_FAULT_MAJOR;
 retry_find:
                 page = find_get_page(mapping, offset);
@@ -2229,7 +2231,7 @@ retry_find:
                         goto no_cached_page;
         }
 
-        if (!lock_page_or_retry(page, vma->vm_mm, vmf->flags)) {
+        if (!lock_page_or_retry(page, vmf->vma->vm_mm, vmf->flags)) {
                 put_page(page);
                 return ret | VM_FAULT_RETRY;
         }
@@ -2396,14 +2398,14 @@ next:
 }
 EXPORT_SYMBOL(filemap_map_pages);
 
-int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
+int filemap_page_mkwrite(struct vm_fault *vmf)
 {
         struct page *page = vmf->page;
-        struct inode *inode = file_inode(vma->vm_file);
+        struct inode *inode = file_inode(vmf->vma->vm_file);
         int ret = VM_FAULT_LOCKED;
 
         sb_start_pagefault(inode->i_sb);
-        file_update_time(vma->vm_file);
+        file_update_time(vmf->vma->vm_file);
         lock_page(page);
         if (page->mapping != inode->i_mapping) {
                 unlock_page(page);