mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
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. [[email protected]: fix ARM build] Link: http://lkml.kernel.org/r/[email protected] Link: http://lkml.kernel.org/r/148521301778.19116.10840599906674778980.stgit@djiang5-desk3.ch.intel.com Signed-off-by: Dave Jiang <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Reviewed-by: Ross Zwisler <[email protected]> Cc: Theodore Ts'o <[email protected]> Cc: Darrick J. Wong <[email protected]> Cc: Matthew Wilcox <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: Jan Kara <[email protected]> Cc: Dan Williams <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
374ad05ab6
commit
11bac80004
87 changed files with 283 additions and 290 deletions
|
|
@ -3125,8 +3125,7 @@ void vm_stat_account(struct mm_struct *mm, vm_flags_t flags, long npages)
|
|||
mm->data_vm += npages;
|
||||
}
|
||||
|
||||
static int special_mapping_fault(struct vm_area_struct *vma,
|
||||
struct vm_fault *vmf);
|
||||
static int special_mapping_fault(struct vm_fault *vmf);
|
||||
|
||||
/*
|
||||
* Having a close hook prevents vma merging regardless of flags.
|
||||
|
|
@ -3161,9 +3160,9 @@ static const struct vm_operations_struct legacy_special_mapping_vmops = {
|
|||
.fault = special_mapping_fault,
|
||||
};
|
||||
|
||||
static int special_mapping_fault(struct vm_area_struct *vma,
|
||||
struct vm_fault *vmf)
|
||||
static int special_mapping_fault(struct vm_fault *vmf)
|
||||
{
|
||||
struct vm_area_struct *vma = vmf->vma;
|
||||
pgoff_t pgoff;
|
||||
struct page **pages;
|
||||
|
||||
|
|
@ -3173,7 +3172,7 @@ static int special_mapping_fault(struct vm_area_struct *vma,
|
|||
struct vm_special_mapping *sm = vma->vm_private_data;
|
||||
|
||||
if (sm->fault)
|
||||
return sm->fault(sm, vma, vmf);
|
||||
return sm->fault(sm, vmf->vma, vmf);
|
||||
|
||||
pages = sm->pages;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue