From 32ddcbb0159a697e3b6b6335751eb6825d38cf09 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Wed, 9 Nov 2011 12:54:43 +0000
Subject: [PATCH] --- yaml --- r: 280331 b: refs/heads/master c:
 114b80ce2c05f91f10fffbf303080357d73c0675 h: refs/heads/master i:   280329:
 c9bafafc0e6c74d2091c3c7a0b0339b9c970a624   280327:
 26de5a955fe8a4d901bbd6d8467022c4af9b873f v: v3

---
 [refs]                | 2 +-
 trunk/fs/gfs2/xattr.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 993893ce34bc..01a59ed39b6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87654896ca619ff64f94d3881d6bd0ec7b29e25f
+refs/heads/master: 114b80ce2c05f91f10fffbf303080357d73c0675
diff --git a/trunk/fs/gfs2/xattr.c b/trunk/fs/gfs2/xattr.c
index 71d7bf830c09..a201a1d57a6d 100644
--- a/trunk/fs/gfs2/xattr.c
+++ b/trunk/fs/gfs2/xattr.c
@@ -549,9 +549,10 @@ int gfs2_xattr_acl_get(struct gfs2_inode *ip, const char *name, char **ppdata)
 		goto out;
 
 	error = gfs2_ea_get_copy(ip, &el, data, len);
-	if (error == 0)
-		error = len;
-	*ppdata = data;
+	if (error < 0)
+		kfree(data);
+	else
+		*ppdata = data;
 out:
 	brelse(el.el_bh);
 	return error;