diff options
| author | Christian Brauner <christian.brauner@ubuntu.com> | 2021-07-27 12:48:49 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2021-08-23 13:19:13 +0200 |
| commit | d4d09464614227a6cc9ae42cd1d761e4320e4ebc (patch) | |
| tree | 937e6cf2456379ac9362a76552d43d3c7a7f2bf5 /fs/btrfs | |
| parent | 98b6ab5fc0988242114a4f0e02ed225685d9cc2b (diff) | |
| download | lwn-d4d09464614227a6cc9ae42cd1d761e4320e4ebc.tar.gz lwn-d4d09464614227a6cc9ae42cd1d761e4320e4ebc.zip | |
btrfs: allow idmapped setattr inode op
Enable btrfs_setattr() to handle idmapped mounts. This is just a matter
of passing down the mount's userns.
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/inode.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index c040d9925077..88ac63f3b57b 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -5392,7 +5392,7 @@ static int btrfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentr if (btrfs_root_readonly(root)) return -EROFS; - err = setattr_prepare(&init_user_ns, dentry, attr); + err = setattr_prepare(mnt_userns, dentry, attr); if (err) return err; @@ -5403,13 +5403,12 @@ static int btrfs_setattr(struct user_namespace *mnt_userns, struct dentry *dentr } if (attr->ia_valid) { - setattr_copy(&init_user_ns, inode, attr); + setattr_copy(mnt_userns, inode, attr); inode_inc_iversion(inode); err = btrfs_dirty_inode(inode); if (!err && attr->ia_valid & ATTR_MODE) - err = posix_acl_chmod(&init_user_ns, inode, - inode->i_mode); + err = posix_acl_chmod(mnt_userns, inode, inode->i_mode); } return err; |