Pull fujitsu into release branch

[deliverable/linux.git] / fs / jffs2 / acl.c

diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 9728614b89588252431f83ffa454cd1bd89c020d..77fc5838609ce3d3a3246abdeb8910ab593f782a 100644 (file)
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -372,7 +372,7 @@ int jffs2_init_acl_post(struct inode *inode)
                        return rc;
        }
 
-       return rc;
+       return 0;
 }
 
 void jffs2_clear_acl(struct jffs2_inode_info *f)