Ticket #2732: workaround.patch

fs/jffs2/acl.c

@@ -21 +21 @@
 #include <linux/mtd/mtd.h>
 #include "nodelist.h"
 
+static int jffs2_acl_set_i_mode(struct inode *inode)
+{
+        struct iattr iattr;
+
+        iattr.ia_valid = ATTR_MODE;
+        iattr.ia_mode = inode->i_mode;
+
+        return jffs2_do_setattr(inode, &iattr);
+}
+
 static size_t jffs2_acl_size(int count)
 {
         if (count <= 4) {
@@ -248 +258 @@
                                 return rc;
                         if (inode->i_mode != mode) {
                                 inode->i_mode = mode;
-                                jffs2_dirty_inode(inode);
+                                jffs2_acl_set_i_mode(inode);
                         }
                         if (rc == 0)
                                 acl = NULL;
@@ -320 +330 @@
                 acl = jffs2_get_acl(dir, ACL_TYPE_DEFAULT);
                 if (IS_ERR(acl))
                         return PTR_ERR(acl);
-                if (!acl)
+                if (!acl) {
                         inode->i_mode &= ~current->fs->umask;
+                        jffs2_acl_set_i_mode(inode);
+                }
         }
         if (acl) {
                 if (S_ISDIR(inode->i_mode)) {

fs/jffs2/fs.c

@@ -24 +24 @@
 
 static int jffs2_flash_setup(struct jffs2_sb_info *c);
 
-static int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)
+int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)
 {
         struct jffs2_full_dnode *old_metadata, *new_metadata;
         struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);