Skip to content

Commit

Permalink
[PATCH] i_mutex does not need to be locked in reiserfs_delete_inode()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexander Zarochentsev authored and Linus Torvalds committed Aug 6, 2006
1 parent c3760ae commit b0b33de
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions fs/reiserfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.. */
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);

if (journal_begin(&th, inode->i_sb, jbegin_count)) {
mutex_unlock(&inode->i_mutex);
if (journal_begin(&th, inode->i_sb, jbegin_count))
goto out;
}
reiserfs_update_inode_transaction(inode);

err = reiserfs_delete_object(&th, inode);
Expand All @@ -57,12 +53,8 @@ void reiserfs_delete_inode(struct inode *inode)
if (!err)
DQUOT_FREE_INODE(inode);

if (journal_end(&th, inode->i_sb, jbegin_count)) {
mutex_unlock(&inode->i_mutex);
if (journal_end(&th, inode->i_sb, jbegin_count))
goto out;
}

mutex_unlock(&inode->i_mutex);

/* check return value from reiserfs_delete_object after
* ending the transaction
Expand Down

0 comments on commit b0b33de

Please sign in to comment.