wrappers for ->i_mutex access
parallel to mutex_{lock,unlock,trylock,is_locked,lock_nested}, inode_foo(inode) being mutex_foo(&inode->i_mutex). Please, use those for access to ->i_mutex; over the coming cycle ->i_mutex will become rwsem, with ->lookup() done with it held only shared. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -141,7 +141,7 @@ void ocfs2_free_ac_resource(struct ocfs2_alloc_context *ac)
|
||||
if (ac->ac_which != OCFS2_AC_USE_LOCAL)
|
||||
ocfs2_inode_unlock(inode, 1);
|
||||
|
||||
mutex_unlock(&inode->i_mutex);
|
||||
inode_unlock(inode);
|
||||
|
||||
iput(inode);
|
||||
ac->ac_inode = NULL;
|
||||
@@ -797,11 +797,11 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
mutex_lock(&alloc_inode->i_mutex);
|
||||
inode_lock(alloc_inode);
|
||||
|
||||
status = ocfs2_inode_lock(alloc_inode, &bh, 1);
|
||||
if (status < 0) {
|
||||
mutex_unlock(&alloc_inode->i_mutex);
|
||||
inode_unlock(alloc_inode);
|
||||
iput(alloc_inode);
|
||||
|
||||
mlog_errno(status);
|
||||
@@ -2875,10 +2875,10 @@ int ocfs2_test_inode_bit(struct ocfs2_super *osb, u64 blkno, int *res)
|
||||
goto bail;
|
||||
}
|
||||
|
||||
mutex_lock(&inode_alloc_inode->i_mutex);
|
||||
inode_lock(inode_alloc_inode);
|
||||
status = ocfs2_inode_lock(inode_alloc_inode, &alloc_bh, 0);
|
||||
if (status < 0) {
|
||||
mutex_unlock(&inode_alloc_inode->i_mutex);
|
||||
inode_unlock(inode_alloc_inode);
|
||||
iput(inode_alloc_inode);
|
||||
mlog(ML_ERROR, "lock on alloc inode on slot %u failed %d\n",
|
||||
(u32)suballoc_slot, status);
|
||||
@@ -2891,7 +2891,7 @@ int ocfs2_test_inode_bit(struct ocfs2_super *osb, u64 blkno, int *res)
|
||||
mlog(ML_ERROR, "test suballoc bit failed %d\n", status);
|
||||
|
||||
ocfs2_inode_unlock(inode_alloc_inode, 0);
|
||||
mutex_unlock(&inode_alloc_inode->i_mutex);
|
||||
inode_unlock(inode_alloc_inode);
|
||||
|
||||
iput(inode_alloc_inode);
|
||||
brelse(alloc_bh);
|
||||
|
Reference in New Issue
Block a user