]> git.karo-electronics.de Git - karo-tx-linux.git/commit
reiserfs: don't acquire lock recursively in reiserfs_acl_chmod
authorFrederic Weisbecker <fweisbec@gmail.com>
Thu, 2 Dec 2010 22:31:16 +0000 (14:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Dec 2010 22:51:15 +0000 (14:51 -0800)
commit238af8751f64a75f8b638193353b1c31ea32e738
tree8b314e79791f07596640d45053f0486b45f737d9
parent0bae35e14b68f5e7075bc96e5ea608b42bdf8f59
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: Pawel Zawora <pzawora@gmail.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Tested-by: Pawel Zawora <pzawora@gmail.com>
Cc: Jeff Mahoney <jeffm@suse.com>
Cc: <stable@kernel.org> [2.6.32.x+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/reiserfs/xattr_acl.c