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

[PATCH] i_mutex does not need to be locked in reiserfs_delete_inode()

Browse Source 
Fixes an i_mutex-inside-i_mutex lockdep nasty.

Signed-off-by: Alexander Zarochentsev <zam@namesys.com>
Cc: <reiserfs-dev@namesys.com>
Cc: Hans Reiser <reiser@namesys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Alexander Zarochentsev
2006-08-05 12:14:01 -07:00
committed by Linus Torvalds
parent c3760ae1f9
commit b0b33dee2d
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/reiserfs/inode.c
View File

@@ -39,14 +39,10 @@ void reiserfs_delete_inode(struct inode *inode)
/* The = 0 happens when we abort creating a new inode for some reason like lack of space.. */ /* The = 0 happens when we abort creating a new inode for some reason like lack of space.. */
if (!(inode->i_state & I_NEW) && INODE_PKEY(inode)->k_objectid != 0) { /* also handles bad_inode case */ if (!(inode->i_state & I_NEW) && INODE_PKEY(inode)->k_objectid != 0) { /* also handles bad_inode case */
mutex_lock(&inode->i_mutex);
reiserfs_delete_xattrs(inode); reiserfs_delete_xattrs(inode);
if (journal_begin(&th, inode->i_sb, jbegin_count)) { if (journal_begin(&th, inode->i_sb, jbegin_count))
mutex_unlock(&inode->i_mutex);
goto out; goto out;
}
reiserfs_update_inode_transaction(inode); reiserfs_update_inode_transaction(inode);
err = reiserfs_delete_object(&th, inode); err = reiserfs_delete_object(&th, inode);
@@ -57,12 +53,8 @@ void reiserfs_delete_inode(struct inode *inode)
if (!err) if (!err)
DQUOT_FREE_INODE(inode); DQUOT_FREE_INODE(inode);
if (journal_end(&th, inode->i_sb, jbegin_count)) { if (journal_end(&th, inode->i_sb, jbegin_count))
mutex_unlock(&inode->i_mutex);
goto out; goto out;
}
mutex_unlock(&inode->i_mutex);
/* check return value from reiserfs_delete_object after /* check return value from reiserfs_delete_object after
* ending the transaction * ending the transaction