---

yaml --- r: 280331 b: refs/heads/master c: 114b80c h: refs/heads/master i: 280329: c9bafaf 280327: 26de5a9 v: v3
git-mirror · Nov 9, 2011 · 32ddcbb · 32ddcbb
1 parent ba484df
commit 32ddcbb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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;