From f746319f81180b14ccdf6b5e5337d9d3b6b55ec8 Mon Sep 17 00:00:00 2001
From: KaiGai Kohei <kaigai@ak.jp.nec.com>
Date: Sun, 11 Jun 2006 10:45:22 +0900
Subject: [PATCH] --- yaml --- r: 30935 b: refs/heads/master c:
 a1ae76e96a18edf4b8a4d4e102762060c26d1c6a h: refs/heads/master i:   30933:
 c7ccb88b04873c500b9e634331042488a88daf96   30931:
 fb3e95e872b74b6991ef122bc195937be309e2a9   30927:
 1118c25652b77cdf3c50dc775808cce3f814de49 v: v3

---
 [refs]               | 2 +-
 trunk/fs/jffs2/acl.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5456f0ca77a7..1e58bf29f95b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9f700f840bd481b3e01fcad1ba8da01794a6726
+refs/heads/master: a1ae76e96a18edf4b8a4d4e102762060c26d1c6a
diff --git a/trunk/fs/jffs2/acl.c b/trunk/fs/jffs2/acl.c
index 320dd48b834e..9c2077e7e081 100644
--- a/trunk/fs/jffs2/acl.c
+++ b/trunk/fs/jffs2/acl.c
@@ -267,6 +267,8 @@ static int jffs2_set_acl(struct inode *inode, int type, struct posix_acl *acl)
 	}
 
 	rc = do_jffs2_setxattr(inode, xprefix, "", value, size, 0);
+	if (!value && rc == -ENODATA)
+		rc = 0;
 	if (value)
 		kfree(value);
 	if (!rc) {