diff options
Diffstat (limited to 'fs/zonefs')
| -rw-r--r-- | fs/zonefs/super.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c index 010b53545e5b..23b8b299c64e 100644 --- a/fs/zonefs/super.c +++ b/fs/zonefs/super.c @@ -540,7 +540,7 @@ static int zonefs_remount(struct super_block *sb, int *flags, char *data) return zonefs_parse_options(sb, data); } -static int zonefs_inode_setattr(struct user_namespace *mnt_userns, +static int zonefs_inode_setattr(struct mnt_idmap *idmap, struct dentry *dentry, struct iattr *iattr) { struct inode *inode = d_inode(dentry); @@ -549,7 +549,7 @@ static int zonefs_inode_setattr(struct user_namespace *mnt_userns, if (unlikely(IS_IMMUTABLE(inode))) return -EPERM; - ret = setattr_prepare(&init_user_ns, dentry, iattr); + ret = setattr_prepare(&nop_mnt_idmap, dentry, iattr); if (ret) return ret; @@ -566,7 +566,7 @@ static int zonefs_inode_setattr(struct user_namespace *mnt_userns, !uid_eq(iattr->ia_uid, inode->i_uid)) || ((iattr->ia_valid & ATTR_GID) && !gid_eq(iattr->ia_gid, inode->i_gid))) { - ret = dquot_transfer(mnt_userns, inode, iattr); + ret = dquot_transfer(&nop_mnt_idmap, inode, iattr); if (ret) return ret; } @@ -577,7 +577,7 @@ static int zonefs_inode_setattr(struct user_namespace *mnt_userns, return ret; } - setattr_copy(&init_user_ns, inode, iattr); + setattr_copy(&nop_mnt_idmap, inode, iattr); if (S_ISREG(inode->i_mode)) { struct zonefs_zone *z = zonefs_inode_zone(inode); @@ -692,7 +692,7 @@ static struct inode *zonefs_get_zgroup_inode(struct super_block *sb, return inode; inode->i_ino = ino; - inode_init_owner(&init_user_ns, inode, root, S_IFDIR | 0555); + inode_init_owner(&nop_mnt_idmap, inode, root, S_IFDIR | 0555); inode->i_size = sbi->s_zgroup[ztype].g_nr_zones; inode->i_ctime = inode->i_mtime = inode->i_atime = root->i_ctime; inode->i_private = &sbi->s_zgroup[ztype]; |