diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 16:51:25 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 16:51:25 +1100 |
| commit | a9be5a59553a6b5d424d8ed37f058edfcc09a7d9 (patch) | |
| tree | 9a06877913222d1d4f0ccc09c34d23a3b88d6e10 /fs/iomap.c | |
| parent | eb27cd91f0b42319cd1cdefbed9ed7d87215890f (diff) | |
| parent | 0cbe42d9fadb4e29daa00a86d7030488d9469912 (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'fs/iomap.c')
| -rw-r--r-- | fs/iomap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/iomap.c b/fs/iomap.c index a51cb4c07d4d..ccba165bed49 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -445,11 +445,10 @@ iomap_page_mkwrite_actor(struct inode *inode, loff_t pos, loff_t length, return length; } -int iomap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, - struct iomap_ops *ops) +int iomap_page_mkwrite(struct vm_fault *vmf, struct iomap_ops *ops) { struct page *page = vmf->page; - struct inode *inode = file_inode(vma->vm_file); + struct inode *inode = file_inode(vmf->vma->vm_file); unsigned long length; loff_t offset, size; ssize_t ret; |