diff options
author | Christoph Hellwig <hch@infradead.org> | 2013-12-06 15:30:09 -0500 |
---|---|---|
committer | Ben Myers <bpm@sgi.com> | 2013-12-18 16:39:30 -0500 |
commit | 309ecac8e7c937c5811ef8f0efc14b3d1bd18775 (patch) | |
tree | b1a34a04e6ac1500e456d5d3ecca5d7cfb56a7c7 /fs/xfs/xfs_file.c | |
parent | 01f4f3277556d4f4f833371db0219b0ca11c5409 (diff) |
xfs: rename xfs_ilock_map_shared
Make it clear that we're only locking against the extent map on the data
fork. Also clean the function up a little bit.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_file.c')
-rw-r--r-- | fs/xfs/xfs_file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 349bfa28aa3d..e00121592632 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c | |||
@@ -912,7 +912,7 @@ xfs_dir_open( | |||
912 | * If there are any blocks, read-ahead block 0 as we're almost | 912 | * If there are any blocks, read-ahead block 0 as we're almost |
913 | * certain to have the next operation be a read there. | 913 | * certain to have the next operation be a read there. |
914 | */ | 914 | */ |
915 | mode = xfs_ilock_map_shared(ip); | 915 | mode = xfs_ilock_data_map_shared(ip); |
916 | if (ip->i_d.di_nextents > 0) | 916 | if (ip->i_d.di_nextents > 0) |
917 | xfs_dir3_data_readahead(NULL, ip, 0, -1); | 917 | xfs_dir3_data_readahead(NULL, ip, 0, -1); |
918 | xfs_iunlock(ip, mode); | 918 | xfs_iunlock(ip, mode); |
@@ -1215,7 +1215,7 @@ xfs_seek_data( | |||
1215 | uint lock; | 1215 | uint lock; |
1216 | int error; | 1216 | int error; |
1217 | 1217 | ||
1218 | lock = xfs_ilock_map_shared(ip); | 1218 | lock = xfs_ilock_data_map_shared(ip); |
1219 | 1219 | ||
1220 | isize = i_size_read(inode); | 1220 | isize = i_size_read(inode); |
1221 | if (start >= isize) { | 1221 | if (start >= isize) { |
@@ -1319,7 +1319,7 @@ xfs_seek_hole( | |||
1319 | if (XFS_FORCED_SHUTDOWN(mp)) | 1319 | if (XFS_FORCED_SHUTDOWN(mp)) |
1320 | return -XFS_ERROR(EIO); | 1320 | return -XFS_ERROR(EIO); |
1321 | 1321 | ||
1322 | lock = xfs_ilock_map_shared(ip); | 1322 | lock = xfs_ilock_data_map_shared(ip); |
1323 | 1323 | ||
1324 | isize = i_size_read(inode); | 1324 | isize = i_size_read(inode); |
1325 | if (start >= isize) { | 1325 | if (start >= isize) { |