mm, dax: make pmd_fault() and friends be the same as fault()
Instead of passing in multiple parameters in the pmd_fault() handler, a vmf can be passed in just like a fault() handler. This will simplify code and remove the need for the actual pmd fault handlers to allocate a vmf. Related functions are also modified to do the same. [dave.jiang@intel.com: fix issue with xfs_tests stall when DAX option is off] Link: http://lkml.kernel.org/r/148469861071.195597.3619476895250028518.stgit@djiang5-desk3.ch.intel.com Link: http://lkml.kernel.org/r/1484085142-2297-7-git-send-email-ross.zwisler@linux.intel.com Signed-off-by: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com> Reviewed-by: Jan Kara <jack@suse.cz> Cc: Dave Chinner <david@fromorbit.com> Cc: Matthew Wilcox <mawilcox@microsoft.com> Cc: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
27a7ffaccd
commit
d8a849e1bc
@@ -8,9 +8,8 @@
|
||||
|
||||
DECLARE_EVENT_CLASS(dax_pmd_fault_class,
|
||||
TP_PROTO(struct inode *inode, struct vm_area_struct *vma,
|
||||
unsigned long address, unsigned int flags, pgoff_t pgoff,
|
||||
pgoff_t max_pgoff, int result),
|
||||
TP_ARGS(inode, vma, address, flags, pgoff, max_pgoff, result),
|
||||
struct vm_fault *vmf, pgoff_t max_pgoff, int result),
|
||||
TP_ARGS(inode, vma, vmf, max_pgoff, result),
|
||||
TP_STRUCT__entry(
|
||||
__field(unsigned long, ino)
|
||||
__field(unsigned long, vm_start)
|
||||
@@ -29,9 +28,9 @@ DECLARE_EVENT_CLASS(dax_pmd_fault_class,
|
||||
__entry->vm_start = vma->vm_start;
|
||||
__entry->vm_end = vma->vm_end;
|
||||
__entry->vm_flags = vma->vm_flags;
|
||||
__entry->address = address;
|
||||
__entry->flags = flags;
|
||||
__entry->pgoff = pgoff;
|
||||
__entry->address = vmf->address;
|
||||
__entry->flags = vmf->flags;
|
||||
__entry->pgoff = vmf->pgoff;
|
||||
__entry->max_pgoff = max_pgoff;
|
||||
__entry->result = result;
|
||||
),
|
||||
@@ -54,9 +53,9 @@ DECLARE_EVENT_CLASS(dax_pmd_fault_class,
|
||||
#define DEFINE_PMD_FAULT_EVENT(name) \
|
||||
DEFINE_EVENT(dax_pmd_fault_class, name, \
|
||||
TP_PROTO(struct inode *inode, struct vm_area_struct *vma, \
|
||||
unsigned long address, unsigned int flags, pgoff_t pgoff, \
|
||||
struct vm_fault *vmf, \
|
||||
pgoff_t max_pgoff, int result), \
|
||||
TP_ARGS(inode, vma, address, flags, pgoff, max_pgoff, result))
|
||||
TP_ARGS(inode, vma, vmf, max_pgoff, result))
|
||||
|
||||
DEFINE_PMD_FAULT_EVENT(dax_pmd_fault);
|
||||
DEFINE_PMD_FAULT_EVENT(dax_pmd_fault_done);
|
||||
|
Reference in New Issue
Block a user