Unverified Commit 13e83a49 authored by Christian Brauner's avatar Christian Brauner Committed by Christian Brauner (Microsoft)
Browse files

fs: port ->set_acl() to pass mnt_idmap 



Convert to struct mnt_idmap.

Last cycle we merged the necessary infrastructure in
256c8aed ("fs: introduce dedicated idmap type for mounts").
This is just the conversion to struct mnt_idmap.

Currently we still pass around the plain namespace that was attached to a
mount. This is in general pretty convenient but it makes it easy to
conflate namespaces that are relevant on the filesystem with namespaces
that are relevent on the mount level. Especially for non-vfs developers
without detailed knowledge in this area this can be a potential source for
bugs.

Once the conversion to struct mnt_idmap is done all helpers down to the
really low-level helpers will take a struct mnt_idmap argument instead of
two namespace arguments. This way it becomes impossible to conflate the two
eliminating the possibility of any bugs. All of the vfs and all filesystems
only operate on struct mnt_idmap.

Acked-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarChristian Brauner (Microsoft) <brauner@kernel.org>
parent 77435322

Documentation/filesystems/vfs.rst

+1 −1
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ As of kernel 2.6.22, the following members are defined: 
				   unsigned open_flag, umode_t create_mode);

		int (*tmpfile) (struct mnt_idmap *, struct inode *, struct file *, umode_t);

		struct posix_acl * (*get_acl)(struct mnt_idmap *, struct dentry *, int);

	        int (*set_acl)(struct user_namespace *, struct dentry *, struct posix_acl *, int);

	        int (*set_acl)(struct mnt_idmap *, struct dentry *, struct posix_acl *, int);

		int (*fileattr_set)(struct user_namespace *mnt_userns,

				    struct dentry *dentry, struct fileattr *fa);

		int (*fileattr_get)(struct dentry *dentry, struct fileattr *fa);

fs/9p/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ struct posix_acl *v9fs_iop_get_acl(struct mnt_idmap *idmap, 
	return v9fs_get_cached_acl(d_inode(dentry), type);

}



int v9fs_iop_set_acl(struct user_namespace *mnt_userns, struct dentry *dentry,

int v9fs_iop_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,

		     struct posix_acl *acl, int type)

{

	int retval;

fs/9p/acl.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ struct posix_acl *v9fs_iop_get_inode_acl(struct inode *inode, int type, 
				   bool rcu);

struct posix_acl *v9fs_iop_get_acl(struct mnt_idmap *idmap,

					  struct dentry *dentry, int type);

int v9fs_iop_set_acl(struct user_namespace *mnt_userns, struct dentry *dentry,

int v9fs_iop_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,

		     struct posix_acl *acl, int type);

int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid);

int v9fs_set_create_acl(struct inode *inode, struct p9_fid *fid,

fs/bad_inode.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static int bad_inode_tmpfile(struct mnt_idmap *idmap, 
	return -EIO;

}



static int bad_inode_set_acl(struct user_namespace *mnt_userns,

static int bad_inode_set_acl(struct mnt_idmap *idmap,

			     struct dentry *dentry, struct posix_acl *acl,

			     int type)

{

fs/btrfs/acl.c

+2 −1
Original line number Diff line number Diff line
@@ -110,10 +110,11 @@ int __btrfs_set_acl(struct btrfs_trans_handle *trans, struct inode *inode, 
	return ret;

}



int btrfs_set_acl(struct user_namespace *mnt_userns, struct dentry *dentry,

int btrfs_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,

		  struct posix_acl *acl, int type)

{

	int ret;

	struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);

	struct inode *inode = d_inode(dentry);

	umode_t old_mode = inode->i_mode;