The patch titled
reiserfs: don't acquire lock recursively in reiserfs_acl_chmod
has been added to the -mm tree. Its filename is
reiserfs-dont-acquire-lock-recursively-in-reiserfs_acl_chmod.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: reiserfs: don't acquire lock recursively in reiserfs_acl_chmod
From: Frederic Weisbecker <fweisbec@xxxxxxxxx>
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@xxxxxxxxx>
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Tested-by: Pawel Zawora <pzawora@xxxxxxxxx>
Cc: Jeff Mahoney <jeffm@xxxxxxxx>
Cc: <stable@xxxxxxxxxx> [2.6.32.x+]
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/reiserfs/xattr_acl.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN fs/reiserfs/xattr_acl.c~reiserfs-dont-acquire-lock-recursively-in-reiserfs_acl_chmod fs/reiserfs/xattr_acl.c
--- a/fs/reiserfs/xattr_acl.c~reiserfs-dont-acquire-lock-recursively-in-reiserfs_acl_chmod
+++ a/fs/reiserfs/xattr_acl.c
@@ -472,7 +472,9 @@ int reiserfs_acl_chmod(struct inode *ino
struct reiserfs_transaction_handle th;
size_t size = reiserfs_xattr_nblocks(inode,
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);
if (!error) {
int error2;
@@ -482,7 +484,7 @@ int reiserfs_acl_chmod(struct inode *ino
if (error2)
error = error2;
}
- reiserfs_write_unlock(inode->i_sb);
+ reiserfs_write_unlock_once(inode->i_sb, depth);
}
posix_acl_release(clone);
return error;
_
Patches currently in -mm which might be from fweisbec@xxxxxxxxx are
linux-next.patch
reiserfs-dont-acquire-lock-recursively-in-reiserfs_acl_chmod.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
