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) {