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

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

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index ca1720fc1187e7d97784f4da062ed4b198321302..15dabeac4690500f8f6e6d05d64b5cba18729781 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -833,7 +833,7 @@ static bool f2fs_force_buffered_io(struct inode *inode, int rw)
        return false;
 }
 
-int f2fs_getattr(struct user_namespace *mnt_userns, const struct path *path,
+int f2fs_getattr(struct mnt_idmap *idmap, const struct path *path,
                 struct kstat *stat, u32 request_mask, unsigned int query_flags)
 {
        struct inode *inode = d_inode(path->dentry);
@@ -888,7 +888,7 @@ int f2fs_getattr(struct user_namespace *mnt_userns, const struct path *path,
                                  STATX_ATTR_NODUMP |
                                  STATX_ATTR_VERITY);
 
-       generic_fillattr(mnt_userns, inode, stat);
+       generic_fillattr(idmap, inode, stat);
 
        /* we need to show initial sectors used for inline_data/dentries */
        if ((S_ISREG(inode->i_mode) && f2fs_has_inline_data(inode)) ||
@@ -899,13 +899,13 @@ int f2fs_getattr(struct user_namespace *mnt_userns, const struct path *path,
 }
 
 #ifdef CONFIG_F2FS_FS_POSIX_ACL
-static void __setattr_copy(struct user_namespace *mnt_userns,
+static void __setattr_copy(struct mnt_idmap *idmap,
                           struct inode *inode, const struct iattr *attr)
 {
        unsigned int ia_valid = attr->ia_valid;
 
-       i_uid_update(mnt_userns, attr, inode);
-       i_gid_update(mnt_userns, attr, inode);
+       i_uid_update(idmap, attr, inode);
+       i_gid_update(idmap, attr, inode);
        if (ia_valid & ATTR_ATIME)
                inode->i_atime = attr->ia_atime;
        if (ia_valid & ATTR_MTIME)
@@ -914,10 +914,10 @@ static void __setattr_copy(struct user_namespace *mnt_userns,
                inode->i_ctime = attr->ia_ctime;
        if (ia_valid & ATTR_MODE) {
                umode_t mode = attr->ia_mode;
-               vfsgid_t vfsgid = i_gid_into_vfsgid(mnt_userns, inode);
+               vfsgid_t vfsgid = i_gid_into_vfsgid(idmap, inode);
 
                if (!vfsgid_in_group_p(vfsgid) &&
-                   !capable_wrt_inode_uidgid(mnt_userns, inode, CAP_FSETID))
+                   !capable_wrt_inode_uidgid(idmap, inode, CAP_FSETID))
                        mode &= ~S_ISGID;
                set_acl_inode(inode, mode);
        }
@@ -926,7 +926,7 @@ static void __setattr_copy(struct user_namespace *mnt_userns,
 #define __setattr_copy setattr_copy
 #endif
 
-int f2fs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
+int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
                 struct iattr *attr)
 {
        struct inode *inode = d_inode(dentry);
@@ -947,7 +947,7 @@ int f2fs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
                !f2fs_is_compress_backend_ready(inode))
                return -EOPNOTSUPP;
 
-       err = setattr_prepare(mnt_userns, dentry, attr);
+       err = setattr_prepare(idmap, dentry, attr);
        if (err)
                return err;
 
@@ -959,15 +959,15 @@ int f2fs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
        if (err)
                return err;
 
-       if (is_quota_modification(mnt_userns, inode, attr)) {
+       if (is_quota_modification(idmap, inode, attr)) {
                err = f2fs_dquot_initialize(inode);
                if (err)
                        return err;
        }
-       if (i_uid_needs_update(mnt_userns, attr, inode) ||
-           i_gid_needs_update(mnt_userns, attr, inode)) {
+       if (i_uid_needs_update(idmap, attr, inode) ||
+           i_gid_needs_update(idmap, attr, inode)) {
                f2fs_lock_op(F2FS_I_SB(inode));
-               err = dquot_transfer(mnt_userns, inode, attr);
+               err = dquot_transfer(idmap, inode, attr);
                if (err) {
                        set_sbi_flag(F2FS_I_SB(inode),
                                        SBI_QUOTA_NEED_REPAIR);
@@ -978,8 +978,8 @@ int f2fs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
                 * update uid/gid under lock_op(), so that dquot and inode can
                 * be updated atomically.
                 */
-               i_uid_update(mnt_userns, attr, inode);
-               i_gid_update(mnt_userns, attr, inode);
+               i_uid_update(idmap, attr, inode);
+               i_gid_update(idmap, attr, inode);
                f2fs_mark_inode_dirty_sync(inode, true);
                f2fs_unlock_op(F2FS_I_SB(inode));
        }
@@ -1019,10 +1019,10 @@ int f2fs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
                spin_unlock(&F2FS_I(inode)->i_size_lock);
        }
 
-       __setattr_copy(mnt_userns, inode, attr);
+       __setattr_copy(idmap, inode, attr);
 
        if (attr->ia_valid & ATTR_MODE) {
-               err = posix_acl_chmod(mnt_userns, dentry, f2fs_get_inode_mode(inode));
+               err = posix_acl_chmod(idmap, dentry, f2fs_get_inode_mode(inode));
 
                if (is_inode_flag_set(inode, FI_ACL_MODE)) {
                        if (!err)
@@ -2043,14 +2043,14 @@ static int f2fs_ioc_getversion(struct file *filp, unsigned long arg)
 static int f2fs_ioc_start_atomic_write(struct file *filp, bool truncate)
 {
        struct inode *inode = file_inode(filp);
-       struct user_namespace *mnt_userns = file_mnt_user_ns(filp);
+       struct mnt_idmap *idmap = file_mnt_idmap(filp);
        struct f2fs_inode_info *fi = F2FS_I(inode);
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
        struct inode *pinode;
        loff_t isize;
        int ret;
 
-       if (!inode_owner_or_capable(mnt_userns, inode))
+       if (!inode_owner_or_capable(idmap, inode))
                return -EACCES;
 
        if (!S_ISREG(inode->i_mode))
@@ -2102,7 +2102,7 @@ static int f2fs_ioc_start_atomic_write(struct file *filp, bool truncate)
                        goto out;
                }
 
-               ret = f2fs_get_tmpfile(mnt_userns, pinode, &fi->cow_inode);
+               ret = f2fs_get_tmpfile(idmap, pinode, &fi->cow_inode);
                iput(pinode);
                if (ret) {
                        f2fs_up_write(&fi->i_gc_rwsem[WRITE]);
@@ -2147,10 +2147,10 @@ out:
 static int f2fs_ioc_commit_atomic_write(struct file *filp)
 {
        struct inode *inode = file_inode(filp);
-       struct user_namespace *mnt_userns = file_mnt_user_ns(filp);
+       struct mnt_idmap *idmap = file_mnt_idmap(filp);
        int ret;
 
-       if (!inode_owner_or_capable(mnt_userns, inode))
+       if (!inode_owner_or_capable(idmap, inode))
                return -EACCES;
 
        ret = mnt_want_write_file(filp);
@@ -2179,10 +2179,10 @@ static int f2fs_ioc_commit_atomic_write(struct file *filp)
 static int f2fs_ioc_abort_atomic_write(struct file *filp)
 {
        struct inode *inode = file_inode(filp);
-       struct user_namespace *mnt_userns = file_mnt_user_ns(filp);
+       struct mnt_idmap *idmap = file_mnt_idmap(filp);
        int ret;
 
-       if (!inode_owner_or_capable(mnt_userns, inode))
+       if (!inode_owner_or_capable(idmap, inode))
                return -EACCES;
 
        ret = mnt_want_write_file(filp);
@@ -3105,7 +3105,7 @@ int f2fs_fileattr_get(struct dentry *dentry, struct fileattr *fa)
        return 0;
 }
 
-int f2fs_fileattr_set(struct user_namespace *mnt_userns,
+int f2fs_fileattr_set(struct mnt_idmap *idmap,
                      struct dentry *dentry, struct fileattr *fa)
 {
        struct inode *inode = d_inode(dentry);