Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 309ecac8 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Ben Myers
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 01f4f327

fs/xfs/xfs_aops.c

+1 −1
Original line number Diff line number Diff line
@@ -1217,7 +1217,7 @@ __xfs_get_blocks( 
		lockmode = XFS_ILOCK_EXCL;

		xfs_ilock(ip, lockmode);

	} else {

		lockmode = xfs_ilock_map_shared(ip);

		lockmode = xfs_ilock_data_map_shared(ip);

	}



	ASSERT(offset <= mp->m_super->s_maxbytes);

fs/xfs/xfs_bmap_util.c

+1 −1
Original line number Diff line number Diff line
@@ -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

fs/xfs/xfs_file.c

+3 −3
Original line number Diff line number Diff line
@@ -912,7 +912,7 @@ xfs_dir_open( 
	 * If there are any blocks, read-ahead block 0 as we're almost

	 * 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)

		xfs_dir3_data_readahead(NULL, ip, 0, -1);

	xfs_iunlock(ip, mode);
@@ -1215,7 +1215,7 @@ xfs_seek_data( 
	uint			lock;

	int			error;



	lock = xfs_ilock_map_shared(ip);

	lock = xfs_ilock_data_map_shared(ip);



	isize = i_size_read(inode);

	if (start >= isize) {
@@ -1319,7 +1319,7 @@ xfs_seek_hole( 
	if (XFS_FORCED_SHUTDOWN(mp))

		return -XFS_ERROR(EIO);



	lock = xfs_ilock_map_shared(ip);

	lock = xfs_ilock_data_map_shared(ip);



	isize = i_size_read(inode);

	if (start >= isize) {

fs/xfs/xfs_inode.c

+6 −11
Original line number Diff line number Diff line
@@ -91,20 +91,15 @@ xfs_get_extsz_hint( 
 * xfs_iunlock() call.

 */

uint

xfs_ilock_map_shared(

	xfs_inode_t	*ip)

xfs_ilock_data_map_shared(

	struct xfs_inode	*ip)

{

	uint	lock_mode;

	uint			lock_mode = XFS_ILOCK_SHARED;



	if ((ip->i_d.di_format == XFS_DINODE_FMT_BTREE) &&

	    ((ip->i_df.if_flags & XFS_IFEXTENTS) == 0)) {

	if (ip->i_d.di_format == XFS_DINODE_FMT_BTREE &&

	    (ip->i_df.if_flags & XFS_IFEXTENTS) == 0)

		lock_mode = XFS_ILOCK_EXCL;

	} else {

		lock_mode = XFS_ILOCK_SHARED;

	}



	xfs_ilock(ip, lock_mode);



	return lock_mode;

}
@@ -575,7 +570,7 @@ xfs_lookup( 
	if (XFS_FORCED_SHUTDOWN(dp->i_mount))

		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);

	xfs_iunlock(dp, lock_mode);

fs/xfs/xfs_inode.h

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ int xfs_ilock_nowait(xfs_inode_t *, uint); 
void		xfs_iunlock(xfs_inode_t *, uint);

void		xfs_ilock_demote(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,

			   xfs_nlink_t, xfs_dev_t, prid_t, int,

			   struct xfs_buf **, xfs_inode_t **);