[PATCH 5/6] xfs: always take XFS_MMAPLOCK shared in xfs_dax_fault

Christoph Hellwig
2024-06-19T11:54:42Z

After the previous refactoring, xfs_dax_fault is now never used for write
faults, so don't bother with the xfs_ilock_for_write_fault logic to
protect against writes when remapping is in progress.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/xfs_file.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 51e50afd935895..62a69ed796f2fd 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -1279,12 +1279,11 @@ xfs_dax_fault(
unsigned int order)
{
struct xfs_inode *ip = XFS_I(file_inode(vmf->vma->vm_file));
- unsigned int lock_mode;
vm_fault_t ret;

- lock_mode = xfs_ilock_for_write_fault(ip);
+ xfs_ilock(ip, XFS_MMAPLOCK_SHARED);
ret = xfs_dax_fault_locked(vmf, order, false);
- xfs_iunlock(ip, lock_mode);
+ xfs_iunlock(ip, XFS_MMAPLOCK_SHARED);

return ret;
}
--
2.43.0