mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf

[linux-block.git] / fs / ext4 / inode.c

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 75212a6e69f8e7ceb05e1ac38ab46f9d71e0f7ce..41d8e53e5a7f402c5b4de9d3d2bc018059290010 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -5821,8 +5821,9 @@ static int ext4_bh_unmapped(handle_t *handle, struct buffer_head *bh)
        return !buffer_mapped(bh);
 }
 
-int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
+int ext4_page_mkwrite(struct vm_fault *vmf)
 {
+       struct vm_area_struct *vma = vmf->vma;
        struct page *page = vmf->page;
        loff_t size;
        unsigned long len;
@@ -5912,13 +5913,13 @@ out:
        return ret;
 }
 
-int ext4_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+int ext4_filemap_fault(struct vm_fault *vmf)
 {
-       struct inode *inode = file_inode(vma->vm_file);
+       struct inode *inode = file_inode(vmf->vma->vm_file);
        int err;
 
        down_read(&EXT4_I(inode)->i_mmap_sem);
-       err = filemap_fault(vma, vmf);
+       err = filemap_fault(vmf);
        up_read(&EXT4_I(inode)->i_mmap_sem);
 
        return err;