Merge tag 'acpi-6.3-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-block.git] / fs / exfat / file.c

diff --git a/fs/exfat/file.c b/fs/exfat/file.c
index b33431c74c8afeb8bb7aeeb20d2240a5aca4247b..e99183a746117bd97955b6d48338207e74e50371 100644 (file)
--- a/fs/exfat/file.c
+++ b/fs/exfat/file.c
@@ -225,14 +225,14 @@ write_size:
        mutex_unlock(&sbi->s_lock);
 }
 
-int exfat_getattr(struct user_namespace *mnt_uerns, const struct path *path,
+int exfat_getattr(struct mnt_idmap *idmap, const struct path *path,
                  struct kstat *stat, unsigned int request_mask,
                  unsigned int query_flags)
 {
        struct inode *inode = d_backing_inode(path->dentry);
        struct exfat_inode_info *ei = EXFAT_I(inode);
 
-       generic_fillattr(&init_user_ns, inode, stat);
+       generic_fillattr(&nop_mnt_idmap, inode, stat);
        exfat_truncate_atime(&stat->atime);
        stat->result_mask |= STATX_BTIME;
        stat->btime.tv_sec = ei->i_crtime.tv_sec;
@@ -241,7 +241,7 @@ int exfat_getattr(struct user_namespace *mnt_uerns, const struct path *path,
        return 0;
 }
 
-int exfat_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
+int exfat_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
                  struct iattr *attr)
 {
        struct exfat_sb_info *sbi = EXFAT_SB(dentry->d_sb);
@@ -265,7 +265,7 @@ int exfat_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
                                ATTR_TIMES_SET);
        }
 
-       error = setattr_prepare(&init_user_ns, dentry, attr);
+       error = setattr_prepare(&nop_mnt_idmap, dentry, attr);
        attr->ia_valid = ia_valid;
        if (error)
                goto out;
@@ -292,7 +292,7 @@ int exfat_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
        if (attr->ia_valid & ATTR_SIZE)
                inode->i_mtime = inode->i_ctime = current_time(inode);
 
-       setattr_copy(&init_user_ns, inode, attr);
+       setattr_copy(&nop_mnt_idmap, inode, attr);
        exfat_truncate_atime(&inode->i_atime);
 
        if (attr->ia_valid & ATTR_SIZE) {