Commit b9251b82 authored Apr 22, 2006 by Jan Kara Committed by Linus Torvalds Apr 22, 2006

[PATCH] Fix reiserfs deadlock



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@suse.cz>
Cc: <reiserfs-dev@namesys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 8c4335a8

fs/reiserfs/xattr_acl.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -408,7 +408,8 @@ int reiserfs_cache_default_acl(struct inode *inode)
		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;
		ret = (acl && !IS_ERR(acl));
		if (ret)
		posix_acl_release(acl);
		}

Admin message