summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_file.c
diff options
context:
space:
mode:
authorDarrick J. Wong2017-06-16 20:00:14 +0200
committerDarrick J. Wong2017-06-20 19:45:22 +0200
commitacb9553cab552cf17154814f079f54401eefa474 (patch)
tree694844661fe98f6b0b7b8b9916c81e018c4819ef /fs/xfs/xfs_file.c
parentxfs: return the hash value of a leaf1 directory block (diff)
downloadkernel-qcow2-linux-acb9553cab552cf17154814f079f54401eefa474.tar.gz
kernel-qcow2-linux-acb9553cab552cf17154814f079f54401eefa474.tar.xz
kernel-qcow2-linux-acb9553cab552cf17154814f079f54401eefa474.zip
xfs: pass along transaction context when reading directory block buffers
Teach the directory reading functions to pass along a transaction context if one was supplied. The directory scrub code will use transactions to lock buffers and avoid deadlocking with itself in the case of loops. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Brian Foster <bfoster@redhat.com>
Diffstat (limited to 'fs/xfs/xfs_file.c')
-rw-r--r--fs/xfs/xfs_file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 5fb5a0958a14..36c129303fcf 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -950,7 +950,7 @@ xfs_file_readdir(
*/
bufsize = (size_t)min_t(loff_t, 32768, ip->i_d.di_size);
- return xfs_readdir(ip, ctx, bufsize);
+ return xfs_readdir(NULL, ip, ctx, bufsize);
}
/*