LU-16667 build: struct mnt_idmap, linux/filelock.h

[fs/lustre-release.git] / lustre / llite / llite_lib.c

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 4dff15a..f5e7043 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -1972,7 +1972,7 @@ static int ll_md_setattr(struct dentry *dentry, struct md_op_data *op_data)
                            !S_ISDIR(inode->i_mode)) {
                                ia_valid = op_data->op_attr.ia_valid;
                                op_data->op_attr.ia_valid &= ~TIMES_SET_FLAGS;
-                               rc = simple_setattr(&init_user_ns, dentry,
+                               rc = simple_setattr(&nop_mnt_idmap, dentry,
                                                    &op_data->op_attr);
                                op_data->op_attr.ia_valid = ia_valid;
                        }
@@ -1995,7 +1995,7 @@ static int ll_md_setattr(struct dentry *dentry, struct md_op_data *op_data)
        op_data->op_attr.ia_valid &= ~(TIMES_SET_FLAGS | ATTR_SIZE);
        if (S_ISREG(inode->i_mode))
                ll_inode_lock(inode);
-       rc = simple_setattr(&init_user_ns, dentry, &op_data->op_attr);
+       rc = simple_setattr(&nop_mnt_idmap, dentry, &op_data->op_attr);
        if (S_ISREG(inode->i_mode))
                ll_inode_unlock(inode);
        op_data->op_attr.ia_valid = ia_valid;
@@ -2480,8 +2480,7 @@ clear:
        RETURN(rc);
 }
 
-int ll_setattr(struct user_namespace *mnt_userns, struct dentry *de,
-              struct iattr *attr)
+int ll_setattr(struct mnt_idmap *map, struct dentry *de, struct iattr *attr)
 {
        int mode = de->d_inode->i_mode;
        enum op_xvalid xvalid = 0;
@@ -3222,7 +3221,7 @@ int ll_fileattr_get(struct dentry *dentry, struct fileattr *fa)
                            &fa->fsx_xflags, &fa->fsx_projid);
 }
 
-int ll_fileattr_set(struct user_namespace *mnt_userns,
+int ll_fileattr_set(struct mnt_idmap *mnt_userns,
                    struct dentry *dentry, struct fileattr *fa)
 {
        if (fa->fsx_valid)