Merge tag 'ubifs-for-linus-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / fs / jffs2 / fs.c

diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index e952b0bd548b6c10095f7f9df9f17e206057f149..038516bee1abaac6b8acb0ff8652cc12f474e848 100644 (file)
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -190,19 +190,19 @@ int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)
        return 0;
 }
 
-int jffs2_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
+int jffs2_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
                  struct iattr *iattr)
 {
        struct inode *inode = d_inode(dentry);
        int rc;
 
-       rc = setattr_prepare(&init_user_ns, dentry, iattr);
+       rc = setattr_prepare(&nop_mnt_idmap, dentry, iattr);
        if (rc)
                return rc;
 
        rc = jffs2_do_setattr(inode, iattr);
        if (!rc && (iattr->ia_valid & ATTR_MODE))
-               rc = posix_acl_chmod(&init_user_ns, dentry, inode->i_mode);
+               rc = posix_acl_chmod(&nop_mnt_idmap, dentry, inode->i_mode);
 
        return rc;
 }