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

[XFS] kill xfs_rwlock/xfs_rwunlock

Browse Source 
We can just use xfs_ilock/xfs_iunlock instead and get rid of the ugly
bhv_vrwlock_t.

SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30533a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:
Christoph Hellwig
2008-03-06 13:44:57 +11:00
committed by Lachlan McIlroy
parent 43973964a3
commit 126468b115
6 changed files with 16 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
fs/xfs/xfs_vnodeops.c
View File

@@ -3374,47 +3374,6 @@ std_return:
goto std_return;
}
int
xfs_rwlock(
xfs_inode_t *ip,
bhv_vrwlock_t locktype)
{
if (S_ISDIR(ip->i_d.di_mode))
return 1;
if (locktype == VRWLOCK_WRITE) {
xfs_ilock(ip, XFS_IOLOCK_EXCL);
} else if (locktype == VRWLOCK_TRY_READ) {
return xfs_ilock_nowait(ip, XFS_IOLOCK_SHARED);
} else if (locktype == VRWLOCK_TRY_WRITE) {
return xfs_ilock_nowait(ip, XFS_IOLOCK_EXCL);
} else {
ASSERT((locktype == VRWLOCK_READ) ||
(locktype == VRWLOCK_WRITE_DIRECT));
xfs_ilock(ip, XFS_IOLOCK_SHARED);
}
return 1;
}
void
xfs_rwunlock(
xfs_inode_t *ip,
bhv_vrwlock_t locktype)
{
if (S_ISDIR(ip->i_d.di_mode))
return;
if (locktype == VRWLOCK_WRITE) {
xfs_iunlock(ip, XFS_IOLOCK_EXCL);
} else {
ASSERT((locktype == VRWLOCK_READ) ||
(locktype == VRWLOCK_WRITE_DIRECT));
xfs_iunlock(ip, XFS_IOLOCK_SHARED);
}
return;
}
int
xfs_inode_flush(
xfs_inode_t *ip,