xfs: remove __xfs_filemap_fault

xfs_filemap_huge_fault only ever serves DAX faults, so hard code the
call to xfs_dax_read_fault and open code __xfs_filemap_fault in the
only remaining caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 0b8e36f8703c3af7e90af5747815b3e449edd1af..7464d874e766364409bb5050c751dba1b98cce5d 100644 (file)
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -1481,20 +1481,6 @@ xfs_write_fault(
        return ret;
 }
 
-static vm_fault_t
-__xfs_filemap_fault(
-       struct vm_fault         *vmf,
-       unsigned int            order)
-{
-       struct inode            *inode = file_inode(vmf->vma->vm_file);
-
-       if (IS_DAX(inode))
-               return xfs_dax_read_fault(vmf, order);
-
-       trace_xfs_read_fault(XFS_I(inode), order);
-       return filemap_fault(vmf);
-}
-
 static inline bool
 xfs_is_write_fault(
        struct vm_fault         *vmf)
@@ -1507,10 +1493,17 @@ static vm_fault_t
 xfs_filemap_fault(
        struct vm_fault         *vmf)
 {
+       struct inode            *inode = file_inode(vmf->vma->vm_file);
+
        /* DAX can shortcut the normal fault path on write faults! */
-       if (IS_DAX(file_inode(vmf->vma->vm_file)) && xfs_is_write_fault(vmf))
-               return xfs_write_fault(vmf, 0);
-       return __xfs_filemap_fault(vmf, 0);
+       if (IS_DAX(inode)) {
+               if (xfs_is_write_fault(vmf))
+                       return xfs_write_fault(vmf, 0);
+               return xfs_dax_read_fault(vmf, 0);
+       }
+
+       trace_xfs_read_fault(XFS_I(inode), 0);
+       return filemap_fault(vmf);
 }
 
 static vm_fault_t
@@ -1524,7 +1517,7 @@ xfs_filemap_huge_fault(
        /* DAX can shortcut the normal fault path on write faults! */
        if (xfs_is_write_fault(vmf))
                return xfs_write_fault(vmf, order);
-       return __xfs_filemap_fault(vmf, order);
+       return xfs_dax_read_fault(vmf, order);
 }
 
 static vm_fault_t