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

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

diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 10c1779af9c519067e54cabe311f3b67843231f0..979ab1d9d0c39ddf56ea9d9f8e1f5c2e4c30a3d3 100644 (file)
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -1264,7 +1264,7 @@ static int do_setattr(struct ubifs_info *c, struct inode *inode,
        return err;
 }
 
-int ubifs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
+int ubifs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
                  struct iattr *attr)
 {
        int err;
@@ -1273,7 +1273,7 @@ int ubifs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
 
        dbg_gen("ino %lu, mode %#x, ia_valid %#x",
                inode->i_ino, inode->i_mode, attr->ia_valid);
-       err = setattr_prepare(&init_user_ns, dentry, attr);
+       err = setattr_prepare(&nop_mnt_idmap, dentry, attr);
        if (err)
                return err;
 
@@ -1623,11 +1623,11 @@ static const char *ubifs_get_link(struct dentry *dentry,
        return fscrypt_get_symlink(inode, ui->data, ui->data_len, done);
 }
 
-static int ubifs_symlink_getattr(struct user_namespace *mnt_userns,
+static int ubifs_symlink_getattr(struct mnt_idmap *idmap,
                                 const struct path *path, struct kstat *stat,
                                 u32 request_mask, unsigned int query_flags)
 {
-       ubifs_getattr(mnt_userns, path, stat, request_mask, query_flags);
+       ubifs_getattr(idmap, path, stat, request_mask, query_flags);
 
        if (IS_ENCRYPTED(d_inode(path->dentry)))
                return fscrypt_symlink_getattr(path, stat);