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

xfs: remove xfs_iunlock_map_shared

Browse Source 
We can just use xfs_iunlock without any loss of clarity.

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:08 -08:00
committed by Ben Myers
parent 30ba7ad543
commit 01f4f32775
4 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/xfs_bmap_util.c
View File

@@ -737,7 +737,7 @@ xfs_getbmap(
out_free_map: out_free_map:
kmem_free(map); kmem_free(map);
out_unlock_ilock: out_unlock_ilock:
xfs_iunlock_map_shared(ip, lock); xfs_iunlock(ip, lock);
out_unlock_iolock: out_unlock_iolock:
xfs_iunlock(ip, XFS_IOLOCK_SHARED); xfs_iunlock(ip, XFS_IOLOCK_SHARED);

4
fs/xfs/xfs_file.c
View File

@@ -1294,7 +1294,7 @@ out:
offset = vfs_setpos(file, offset, inode->i_sb->s_maxbytes); offset = vfs_setpos(file, offset, inode->i_sb->s_maxbytes);
out_unlock: out_unlock:
xfs_iunlock_map_shared(ip, lock); xfs_iunlock(ip, lock);
if (error) if (error)
return -error; return -error;
@@ -1402,7 +1402,7 @@ out:
offset = vfs_setpos(file, offset, inode->i_sb->s_maxbytes); offset = vfs_setpos(file, offset, inode->i_sb->s_maxbytes);
out_unlock: out_unlock:
xfs_iunlock_map_shared(ip, lock); xfs_iunlock(ip, lock);
if (error) if (error)
return -error; return -error;

17
fs/xfs/xfs_inode.c
View File

@@ -88,8 +88,7 @@ xfs_get_extsz_hint(
* have been read in yet, and only lock the inode exclusively if they have not. * 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 * 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 * xfs_iunlock() call.
* actually taken.
*/ */
uint uint
xfs_ilock_map_shared( xfs_ilock_map_shared(
@@ -109,18 +108,6 @@ xfs_ilock_map_shared(
return lock_mode; 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 * 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 * 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); lock_mode = xfs_ilock_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_map_shared(dp, lock_mode); xfs_iunlock(dp, lock_mode);
if (error) if (error)
goto out; goto out;

1
fs/xfs/xfs_inode.h
View File

@@ -338,7 +338,6 @@ 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_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, 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 **);