aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ubifs
diff options
context:
space:
mode:
authorDave Jiang <dave.jiang@intel.com>2017-02-24 17:56:41 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-24 20:46:54 -0500
commit11bac80004499ea59f361ef2a5516c84b6eab675 (patch)
treeb971df98b3fa9d4e62b8f4f7b5ec950181df4daa /fs/ubifs
parent374ad05ab64d696303cec5cc8ec3a65d457b7b1c (diff)
mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf
->fault(), ->page_mkwrite(), and ->pfn_mkwrite() calls do not need to take a vma and vmf parameter when the vma already resides in vmf. Remove the vma parameter to simplify things. [arnd@arndb.de: fix ARM build] Link: http://lkml.kernel.org/r/20170125223558.1451224-1-arnd@arndb.de Link: http://lkml.kernel.org/r/148521301778.19116.10840599906674778980.stgit@djiang5-desk3.ch.intel.com Signed-off-by: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com> Cc: Theodore Ts'o <tytso@mit.edu> Cc: Darrick J. Wong <darrick.wong@oracle.com> Cc: Matthew Wilcox <mawilcox@microsoft.com> Cc: Dave Hansen <dave.hansen@intel.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Jan Kara <jack@suse.com> Cc: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ubifs')
-rw-r--r--fs/ubifs/file.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index b0d783774c96..d9ae86f96df7 100644
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -1506,11 +1506,10 @@ static int ubifs_releasepage(struct page *page, gfp_t unused_gfp_flags)
1506 * mmap()d file has taken write protection fault and is being made writable. 1506 * mmap()d file has taken write protection fault and is being made writable.
1507 * UBIFS must ensure page is budgeted for. 1507 * UBIFS must ensure page is budgeted for.
1508 */ 1508 */
1509static int ubifs_vm_page_mkwrite(struct vm_area_struct *vma, 1509static int ubifs_vm_page_mkwrite(struct vm_fault *vmf)
1510 struct vm_fault *vmf)
1511{ 1510{
1512 struct page *page = vmf->page; 1511 struct page *page = vmf->page;
1513 struct inode *inode = file_inode(vma->vm_file); 1512 struct inode *inode = file_inode(vmf->vma->vm_file);
1514 struct ubifs_info *c = inode->i_sb->s_fs_info; 1513 struct ubifs_info *c = inode->i_sb->s_fs_info;
1515 struct timespec now = ubifs_current_time(inode); 1514 struct timespec now = ubifs_current_time(inode);
1516 struct ubifs_budget_req req = { .new_page = 1 }; 1515 struct ubifs_budget_req req = { .new_page = 1 };