From a458b6c5dfe84ab75b8144863ad3e5191b87dcb8 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Sat, 22 Apr 2006 02:36:24 -0700
Subject: [PATCH] --- yaml --- r: 26106 b: refs/heads/master c:
 b9251b823b5e921c894eb135cb6c64abf483f50e h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/fs/reiserfs/xattr_acl.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 55486db19829..9de542b84d4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c4335a87c9785d2102ab23f09393038e1663314
+refs/heads/master: b9251b823b5e921c894eb135cb6c64abf483f50e
diff --git a/trunk/fs/reiserfs/xattr_acl.c b/trunk/fs/reiserfs/xattr_acl.c
index 58c418fbca2c..97ae1b92bc47 100644
--- a/trunk/fs/reiserfs/xattr_acl.c
+++ b/trunk/fs/reiserfs/xattr_acl.c
@@ -408,8 +408,9 @@ 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;
-		posix_acl_release(acl);
+		ret = (acl && !IS_ERR(acl));
+		if (ret)
+			posix_acl_release(acl);
 	}
 
 	return ret;