Commit 238af875 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Linus Torvalds

reiserfs: don't acquire lock recursively in reiserfs_acl_chmod

reiserfs_acl_chmod() can be called by reiserfs_set_attr() and then take
the reiserfs lock a second time.  Thereafter it may call journal_begin()
that definitely requires the lock not to be nested in order to release
it before taking the journal mutex because the reiserfs lock depends on
the journal mutex already.

So, aviod nesting the lock in reiserfs_acl_chmod().
Reported-by: default avatarPawel Zawora <pzawora@gmail.com>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Tested-by: default avatarPawel Zawora <pzawora@gmail.com>
Cc: Jeff Mahoney <jeffm@suse.com>
Cc: <stable@kernel.org>		[2.6.32.x+]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0bae35e1
...@@ -472,7 +472,9 @@ int reiserfs_acl_chmod(struct inode *inode) ...@@ -472,7 +472,9 @@ int reiserfs_acl_chmod(struct inode *inode)
struct reiserfs_transaction_handle th; struct reiserfs_transaction_handle th;
size_t size = reiserfs_xattr_nblocks(inode, size_t size = reiserfs_xattr_nblocks(inode,
reiserfs_acl_size(clone->a_count)); reiserfs_acl_size(clone->a_count));
reiserfs_write_lock(inode->i_sb); int depth;
depth = reiserfs_write_lock_once(inode->i_sb);
error = journal_begin(&th, inode->i_sb, size * 2); error = journal_begin(&th, inode->i_sb, size * 2);
if (!error) { if (!error) {
int error2; int error2;
...@@ -482,7 +484,7 @@ int reiserfs_acl_chmod(struct inode *inode) ...@@ -482,7 +484,7 @@ int reiserfs_acl_chmod(struct inode *inode)
if (error2) if (error2)
error = error2; error = error2;
} }
reiserfs_write_unlock(inode->i_sb); reiserfs_write_unlock_once(inode->i_sb, depth);
} }
posix_acl_release(clone); posix_acl_release(clone);
return error; return error;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment