From e687222b4b125ad46500e8be791de8288cc07bfc Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Thu, 6 Jan 2011 21:45:21 +0000
Subject: [PATCH] --- yaml --- r: 231760 b: refs/heads/master c:
 42838bb265b9cff3de9587fcacc398b5112dc2d9 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/btrfs/acl.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f5d0d51cc1bf..92ae4908af7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d07bcec969af335d4e35b3921131b7929bd634e
+refs/heads/master: 42838bb265b9cff3de9587fcacc398b5112dc2d9
diff --git a/trunk/fs/btrfs/acl.c b/trunk/fs/btrfs/acl.c
index 2222d161c7b6..6d1410e392d3 100644
--- a/trunk/fs/btrfs/acl.c
+++ b/trunk/fs/btrfs/acl.c
@@ -60,8 +60,10 @@ static struct posix_acl *btrfs_get_acl(struct inode *inode, int type)
 		size = __btrfs_getxattr(inode, name, value, size);
 		if (size > 0) {
 			acl = posix_acl_from_xattr(value, size);
-			if (IS_ERR(acl))
+			if (IS_ERR(acl)) {
+				kfree(value);
 				return acl;
+			}
 			set_cached_acl(inode, type, acl);
 		}
 		kfree(value);