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

fs: port inode_init_owner() to 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 700b7940

arch/powerpc/platforms/cell/spufs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ spufs_mkdir(struct inode *dir, struct dentry *dentry, unsigned int flags, 
	if (!inode)

		return -ENOSPC;



	inode_init_owner(&init_user_ns, inode, dir, mode | S_IFDIR);

	inode_init_owner(&nop_mnt_idmap, inode, dir, mode | S_IFDIR);

	ctx = alloc_spu_context(SPUFS_I(dir)->i_gang); /* XXX gang */

	SPUFS_I(inode)->i_ctx = ctx;

	if (!ctx) {
@@ -468,7 +468,7 @@ spufs_mkgang(struct inode *dir, struct dentry *dentry, umode_t mode) 
		goto out;



	ret = 0;

	inode_init_owner(&init_user_ns, inode, dir, mode | S_IFDIR);

	inode_init_owner(&nop_mnt_idmap, inode, dir, mode | S_IFDIR);

	gang = alloc_spu_gang();

	SPUFS_I(inode)->i_ctx = NULL;

	SPUFS_I(inode)->i_gang = gang;

fs/9p/vfs_inode.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ int v9fs_init_inode(struct v9fs_session_info *v9ses, 
{

	int err = 0;



	inode_init_owner(&init_user_ns, inode, NULL, mode);

	inode_init_owner(&nop_mnt_idmap, inode, NULL, mode);

	inode->i_blocks = 0;

	inode->i_rdev = rdev;

	inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);

fs/bfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int bfs_create(struct mnt_idmap *idmap, struct inode *dir, 
	}

	set_bit(ino, info->si_imap);

	info->si_freei--;

	inode_init_owner(&init_user_ns, inode, dir, mode);

	inode_init_owner(&nop_mnt_idmap, inode, dir, mode);

	inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);

	inode->i_blocks = 0;

	inode->i_op = &bfs_file_inops;

fs/btrfs/btrfs_inode.h

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ int btrfs_new_inode_prepare(struct btrfs_new_inode_args *args, 
int btrfs_create_new_inode(struct btrfs_trans_handle *trans,

			   struct btrfs_new_inode_args *args);

void btrfs_new_inode_args_destroy(struct btrfs_new_inode_args *args);

struct inode *btrfs_new_subvol_inode(struct user_namespace *mnt_userns,

struct inode *btrfs_new_subvol_inode(struct mnt_idmap *idmap,

				     struct inode *dir);

 void btrfs_set_delalloc_extent(struct btrfs_inode *inode, struct extent_state *state,

			        u32 bits);

fs/btrfs/inode.c

+12 −18
Original line number Diff line number Diff line
@@ -6727,13 +6727,12 @@ static int btrfs_create_common(struct inode *dir, struct dentry *dentry, 
static int btrfs_mknod(struct mnt_idmap *idmap, struct inode *dir,

		       struct dentry *dentry, umode_t mode, dev_t rdev)

{

	struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);

	struct inode *inode;



	inode = new_inode(dir->i_sb);

	if (!inode)

		return -ENOMEM;

	inode_init_owner(mnt_userns, inode, dir, mode);

	inode_init_owner(idmap, inode, dir, mode);

	inode->i_op = &btrfs_special_inode_operations;

	init_special_inode(inode, inode->i_mode, rdev);

	return btrfs_create_common(dir, dentry, inode);
@@ -6742,13 +6741,12 @@ static int btrfs_mknod(struct mnt_idmap *idmap, struct inode *dir, 
static int btrfs_create(struct mnt_idmap *idmap, struct inode *dir,

			struct dentry *dentry, umode_t mode, bool excl)

{

	struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);

	struct inode *inode;



	inode = new_inode(dir->i_sb);

	if (!inode)

		return -ENOMEM;

	inode_init_owner(mnt_userns, inode, dir, mode);

	inode_init_owner(idmap, inode, dir, mode);

	inode->i_fop = &btrfs_file_operations;

	inode->i_op = &btrfs_file_inode_operations;

	inode->i_mapping->a_ops = &btrfs_aops;
@@ -6842,13 +6840,12 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir, 
static int btrfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,

		       struct dentry *dentry, umode_t mode)

{

	struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);

	struct inode *inode;



	inode = new_inode(dir->i_sb);

	if (!inode)

		return -ENOMEM;

	inode_init_owner(mnt_userns, inode, dir, S_IFDIR | mode);

	inode_init_owner(idmap, inode, dir, S_IFDIR | mode);

	inode->i_op = &btrfs_dir_inode_operations;

	inode->i_fop = &btrfs_dir_file_operations;

	return btrfs_create_common(dir, dentry, inode);
@@ -8805,7 +8802,7 @@ static int btrfs_truncate(struct btrfs_inode *inode, bool skip_writeback) 
	return ret;

}



struct inode *btrfs_new_subvol_inode(struct user_namespace *mnt_userns,

struct inode *btrfs_new_subvol_inode(struct mnt_idmap *idmap,

				     struct inode *dir)

{

	struct inode *inode;
@@ -8816,7 +8813,7 @@ struct inode *btrfs_new_subvol_inode(struct user_namespace *mnt_userns, 
		 * Subvolumes don't inherit the sgid bit or the parent's gid if

		 * the parent's sgid bit is set. This is probably a bug.

		 */

		inode_init_owner(mnt_userns, inode, NULL,

		inode_init_owner(idmap, inode, NULL,

				 S_IFDIR | (~current_umask() & S_IRWXUGO));

		inode->i_op = &btrfs_dir_inode_operations;

		inode->i_fop = &btrfs_dir_file_operations;
@@ -9292,14 +9289,14 @@ static int btrfs_rename_exchange(struct inode *old_dir, 
	return ret;

}



static struct inode *new_whiteout_inode(struct user_namespace *mnt_userns,

static struct inode *new_whiteout_inode(struct mnt_idmap *idmap,

					struct inode *dir)

{

	struct inode *inode;



	inode = new_inode(dir->i_sb);

	if (inode) {

		inode_init_owner(mnt_userns, inode, dir,

		inode_init_owner(idmap, inode, dir,

				 S_IFCHR | WHITEOUT_MODE);

		inode->i_op = &btrfs_special_inode_operations;

		init_special_inode(inode, inode->i_mode, WHITEOUT_DEV);
@@ -9307,7 +9304,7 @@ static struct inode *new_whiteout_inode(struct user_namespace *mnt_userns, 
	return inode;

}



static int btrfs_rename(struct user_namespace *mnt_userns,

static int btrfs_rename(struct mnt_idmap *idmap,

			struct inode *old_dir, struct dentry *old_dentry,

			struct inode *new_dir, struct dentry *new_dentry,

			unsigned int flags)
@@ -9379,7 +9376,7 @@ static int btrfs_rename(struct user_namespace *mnt_userns, 
		filemap_flush(old_inode->i_mapping);



	if (flags & RENAME_WHITEOUT) {

		whiteout_args.inode = new_whiteout_inode(mnt_userns, old_dir);

		whiteout_args.inode = new_whiteout_inode(idmap, old_dir);

		if (!whiteout_args.inode)

			return -ENOMEM;

		ret = btrfs_new_inode_prepare(&whiteout_args, &trans_num_items);
@@ -9550,7 +9547,6 @@ static int btrfs_rename2(struct mnt_idmap *idmap, struct inode *old_dir, 
			 struct dentry *old_dentry, struct inode *new_dir,

			 struct dentry *new_dentry, unsigned int flags)

{

	struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);

	int ret;



	if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT))
@@ -9560,7 +9556,7 @@ static int btrfs_rename2(struct mnt_idmap *idmap, struct inode *old_dir, 
		ret = btrfs_rename_exchange(old_dir, old_dentry, new_dir,

					    new_dentry);

	else

		ret = btrfs_rename(mnt_userns, old_dir, old_dentry, new_dir,

		ret = btrfs_rename(idmap, old_dir, old_dentry, new_dir,

				   new_dentry, flags);



	btrfs_btree_balance_dirty(BTRFS_I(new_dir)->root->fs_info);
@@ -9763,7 +9759,6 @@ int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, long nr, 
static int btrfs_symlink(struct mnt_idmap *idmap, struct inode *dir,

			 struct dentry *dentry, const char *symname)

{

	struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);

	struct btrfs_fs_info *fs_info = btrfs_sb(dir->i_sb);

	struct btrfs_trans_handle *trans;

	struct btrfs_root *root = BTRFS_I(dir)->root;
@@ -9789,7 +9784,7 @@ static int btrfs_symlink(struct mnt_idmap *idmap, struct inode *dir, 
	inode = new_inode(dir->i_sb);

	if (!inode)

		return -ENOMEM;

	inode_init_owner(mnt_userns, inode, dir, S_IFLNK | S_IRWXUGO);

	inode_init_owner(idmap, inode, dir, S_IFLNK | S_IRWXUGO);

	inode->i_op = &btrfs_symlink_inode_operations;

	inode_nohighmem(inode);

	inode->i_mapping->a_ops = &btrfs_aops;
@@ -10097,7 +10092,6 @@ static int btrfs_permission(struct mnt_idmap *idmap, 
static int btrfs_tmpfile(struct mnt_idmap *idmap, struct inode *dir,

			 struct file *file, umode_t mode)

{

	struct user_namespace *mnt_userns = mnt_idmap_owner(idmap);

	struct btrfs_fs_info *fs_info = btrfs_sb(dir->i_sb);

	struct btrfs_trans_handle *trans;

	struct btrfs_root *root = BTRFS_I(dir)->root;
@@ -10113,7 +10107,7 @@ static int btrfs_tmpfile(struct mnt_idmap *idmap, struct inode *dir, 
	inode = new_inode(dir->i_sb);

	if (!inode)

		return -ENOMEM;

	inode_init_owner(mnt_userns, inode, dir, mode);

	inode_init_owner(idmap, inode, dir, mode);

	inode->i_fop = &btrfs_file_operations;

	inode->i_op = &btrfs_file_inode_operations;

	inode->i_mapping->a_ops = &btrfs_aops;