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

Commit 01f4f327 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Ben Myers
Browse files

xfs: remove xfs_iunlock_map_shared 



We can just use xfs_iunlock without any loss of clarity.

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 30ba7ad5

fs/xfs/xfs_bmap_util.c

+1 −1
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ xfs_getbmap( 
 out_free_map:

	kmem_free(map);

 out_unlock_ilock:

	xfs_iunlock_map_shared(ip, lock);

	xfs_iunlock(ip, lock);

 out_unlock_iolock:

	xfs_iunlock(ip, XFS_IOLOCK_SHARED);

fs/xfs/xfs_file.c

+2 −2
Original line number Diff line number Diff line
@@ -1294,7 +1294,7 @@ xfs_seek_data( 
	offset = vfs_setpos(file, offset, inode->i_sb->s_maxbytes);



out_unlock:

	xfs_iunlock_map_shared(ip, lock);

	xfs_iunlock(ip, lock);



	if (error)

		return -error;
@@ -1402,7 +1402,7 @@ xfs_seek_hole( 
	offset = vfs_setpos(file, offset, inode->i_sb->s_maxbytes);



out_unlock:

	xfs_iunlock_map_shared(ip, lock);

	xfs_iunlock(ip, lock);



	if (error)

		return -error;

fs/xfs/xfs_inode.c

+2 −15
Original line number Diff line number Diff line
@@ -88,8 +88,7 @@ xfs_get_extsz_hint( 
 * have been read in yet, and only lock the inode exclusively if they have not.

 *

 * The function returns a value which should be given to the corresponding

 * xfs_iunlock_map_shared().  This value is the mode in which the lock was

 * actually taken.

 * xfs_iunlock() call.

 */

uint

xfs_ilock_map_shared(
@@ -109,18 +108,6 @@ xfs_ilock_map_shared( 
	return lock_mode;

}



/*

 * This is simply the unlock routine to go with xfs_ilock_map_shared().

 * All it does is call xfs_iunlock() with the given lock_mode.

 */

void

xfs_iunlock_map_shared(

	xfs_inode_t	*ip,

	unsigned int	lock_mode)

{

	xfs_iunlock(ip, lock_mode);

}



/*

 * The xfs inode contains 2 locks: a multi-reader lock called the

 * i_iolock and a multi-reader lock called the i_lock.  This routine
@@ -590,7 +577,7 @@ xfs_lookup( 


	lock_mode = xfs_ilock_map_shared(dp);

	error = xfs_dir_lookup(NULL, dp, name, &inum, ci_name);

	xfs_iunlock_map_shared(dp, lock_mode);

	xfs_iunlock(dp, lock_mode);



	if (error)

		goto out;

fs/xfs/xfs_inode.h

+0 −1
Original line number Diff line number Diff line
@@ -338,7 +338,6 @@ 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 *);

void		xfs_iunlock_map_shared(xfs_inode_t *, uint);

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