The patch titled
Fix reiserfs deadlock
has been removed from the -mm tree. Its filename is
fix-reiserfs-deadlock.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Jan Kara <jack@xxxxxxx>
reiserfs_cache_default_acl() should return whether we successfully found
the acl or not. We have to return correct value even if reiserfs_get_acl()
returns error code and not just 0. Otherwise callers such as
reiserfs_mkdir() can unnecessarily lock the xattrs and later functions such
as reiserfs_new_inode() fail to notice that we have already taken the lock
and try to take it again with obvious consequences.
Signed-off-by: Jan Kara <jack@xxxxxxx>
Cc: <reiserfs-dev@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/reiserfs/xattr_acl.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff -puN fs/reiserfs/xattr_acl.c~fix-reiserfs-deadlock fs/reiserfs/xattr_acl.c
--- devel/fs/reiserfs/xattr_acl.c~fix-reiserfs-deadlock 2006-04-22 02:34:58.000000000 -0700
+++ devel-akpm/fs/reiserfs/xattr_acl.c 2006-04-22 02:34:58.000000000 -0700
@@ -408,8 +408,9 @@ int reiserfs_cache_default_acl(struct in
acl = reiserfs_get_acl(inode, ACL_TYPE_DEFAULT);
reiserfs_read_unlock_xattrs(inode->i_sb);
reiserfs_read_unlock_xattr_i(inode);
- ret = acl ? 1 : 0;
- posix_acl_release(acl);
+ ret = (acl && !IS_ERR(acl));
+ if (ret)
+ posix_acl_release(acl);
}
return ret;
_
Patches currently in -mm which might be from jack@xxxxxxx are
origin.patch
jbd-fix-bug-in-journal_commit_transaction.patch
use-list_add_tail-instead-of-list_add.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
