lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xfs: rename xfs_ilock_map_shared

Browse Source 
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>
This commit is contained in:
Christoph Hellwig
2013-12-06 12:30:09 -08:00
committed by Ben Myers
parent 01f4f32775
commit 309ecac8e7
5 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/xfs_aops.c
View File

@@ -1217,7 +1217,7 @@ __xfs_get_blocks(
lockmode = XFS_ILOCK_EXCL; lockmode = XFS_ILOCK_EXCL;
xfs_ilock(ip, lockmode); xfs_ilock(ip, lockmode);
} else { } else {
lockmode = xfs_ilock_map_shared(ip); lockmode = xfs_ilock_data_map_shared(ip);
} }
ASSERT(offset <= mp->m_super->s_maxbytes); ASSERT(offset <= mp->m_super->s_maxbytes);

2
fs/xfs/xfs_bmap_util.c
View File

@@ -632,7 +632,7 @@ xfs_getbmap(
*/ */
} }
lock = xfs_ilock_map_shared(ip); lock = xfs_ilock_data_map_shared(ip);
/* /*
* Don't let nex be bigger than the number of extents * Don't let nex be bigger than the number of extents

6
fs/xfs/xfs_file.c
View File

@@ -912,7 +912,7 @@ xfs_dir_open(
* If there are any blocks, read-ahead block 0 as we're almost * If there are any blocks, read-ahead block 0 as we're almost
* certain to have the next operation be a read there. * certain to have the next operation be a read there.
*/ */
mode = xfs_ilock_map_shared(ip); mode = xfs_ilock_data_map_shared(ip);
if (ip->i_d.di_nextents > 0) if (ip->i_d.di_nextents > 0)
xfs_dir3_data_readahead(NULL, ip, 0, -1); xfs_dir3_data_readahead(NULL, ip, 0, -1);
xfs_iunlock(ip, mode); xfs_iunlock(ip, mode);
@@ -1215,7 +1215,7 @@ xfs_seek_data(
uint lock; uint lock;
int error; int error;
lock = xfs_ilock_map_shared(ip); lock = xfs_ilock_data_map_shared(ip);
isize = i_size_read(inode); isize = i_size_read(inode);
if (start >= isize) { if (start >= isize) {
@@ -1319,7 +1319,7 @@ xfs_seek_hole(
if (XFS_FORCED_SHUTDOWN(mp)) if (XFS_FORCED_SHUTDOWN(mp))
return -XFS_ERROR(EIO); return -XFS_ERROR(EIO);
lock = xfs_ilock_map_shared(ip); lock = xfs_ilock_data_map_shared(ip);
isize = i_size_read(inode); isize = i_size_read(inode);
if (start >= isize) { if (start >= isize) {

17
fs/xfs/xfs_inode.c
View File

@@ -91,20 +91,15 @@ xfs_get_extsz_hint(
* xfs_iunlock() call. * xfs_iunlock() call.
*/ */
uint uint
xfs_ilock_map_shared( xfs_ilock_data_map_shared(
xfs_inode_t *ip) struct xfs_inode *ip)
{ {
uint lock_mode; uint lock_mode = XFS_ILOCK_SHARED;
if ((ip->i_d.di_format == XFS_DINODE_FMT_BTREE) && if (ip->i_d.di_format == XFS_DINODE_FMT_BTREE &&
((ip->i_df.if_flags & XFS_IFEXTENTS) == 0)) { (ip->i_df.if_flags & XFS_IFEXTENTS) == 0)
lock_mode = XFS_ILOCK_EXCL; lock_mode = XFS_ILOCK_EXCL;
} else {
lock_mode = XFS_ILOCK_SHARED;
}
xfs_ilock(ip, lock_mode); xfs_ilock(ip, lock_mode);
return lock_mode; return lock_mode;
} }
@@ -575,7 +570,7 @@ xfs_lookup(
if (XFS_FORCED_SHUTDOWN(dp->i_mount)) if (XFS_FORCED_SHUTDOWN(dp->i_mount))
return XFS_ERROR(EIO); return XFS_ERROR(EIO);
lock_mode = xfs_ilock_map_shared(dp); lock_mode = xfs_ilock_data_map_shared(dp);
error = xfs_dir_lookup(NULL, dp, name, &inum, ci_name); error = xfs_dir_lookup(NULL, dp, name, &inum, ci_name);
xfs_iunlock(dp, lock_mode); xfs_iunlock(dp, lock_mode);

2
fs/xfs/xfs_inode.h
View File

@@ -337,7 +337,7 @@ int xfs_ilock_nowait(xfs_inode_t *, uint);
void xfs_iunlock(xfs_inode_t *, uint); void xfs_iunlock(xfs_inode_t *, uint);
void xfs_ilock_demote(xfs_inode_t *, uint); void xfs_ilock_demote(xfs_inode_t *, uint);
int xfs_isilocked(xfs_inode_t *, uint); int xfs_isilocked(xfs_inode_t *, uint);
uint xfs_ilock_map_shared(xfs_inode_t *); uint xfs_ilock_data_map_shared(struct xfs_inode *);
int xfs_ialloc(struct xfs_trans *, xfs_inode_t *, umode_t, int xfs_ialloc(struct xfs_trans *, xfs_inode_t *, umode_t,
xfs_nlink_t, xfs_dev_t, prid_t, int, xfs_nlink_t, xfs_dev_t, prid_t, int,
struct xfs_buf **, xfs_inode_t **); struct xfs_buf **, xfs_inode_t **);