From: Christoph Hellwig <hch@lst.de>
Date: Sun, 23 Jun 2024 05:44:30 +0000 (+0200)
Subject: xfs: always take XFS_MMAPLOCK shared in xfs_dax_read_fault
X-Git-Tag: v6.11-rc1~155^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e82fa11fbbcc5426366dc2ddc839fd56b9d53de;p=thirdparty%2Fkernel%2Flinux.git

xfs: always take XFS_MMAPLOCK shared in xfs_dax_read_fault

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>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
---

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 32a2cd6ec82e0..904be41f3e5ec 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -1279,12 +1279,11 @@ xfs_dax_read_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;
 }