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

fs: port ->mkdir() 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 7a77db95

Documentation/filesystems/locking.rst

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ prototypes:: 
	int (*link) (struct dentry *,struct inode *,struct dentry *);

	int (*unlink) (struct inode *,struct dentry *);

	int (*symlink) (struct mnt_idmap *, struct inode *,struct dentry *,const char *);

	int (*mkdir) (struct inode *,struct dentry *,umode_t);

	int (*mkdir) (struct mnt_idmap *, struct inode *,struct dentry *,umode_t);

	int (*rmdir) (struct inode *,struct dentry *);

	int (*mknod) (struct inode *,struct dentry *,umode_t,dev_t);

	int (*rename) (struct inode *, struct dentry *,

Documentation/filesystems/vfs.rst

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ As of kernel 2.6.22, the following members are defined: 
		int (*link) (struct dentry *,struct inode *,struct dentry *);

		int (*unlink) (struct inode *,struct dentry *);

		int (*symlink) (struct mnt_idmap *, struct inode *,struct dentry *,const char *);

		int (*mkdir) (struct user_namespace *, struct inode *,struct dentry *,umode_t);

		int (*mkdir) (struct mnt_idmap *, struct inode *,struct dentry *,umode_t);

		int (*rmdir) (struct inode *,struct dentry *);

		int (*mknod) (struct user_namespace *, struct inode *,struct dentry *,umode_t,dev_t);

		int (*rename) (struct user_namespace *, struct inode *, struct dentry *,

fs/9p/vfs_inode.c

+2 −2
Original line number Diff line number Diff line
@@ -704,14 +704,14 @@ v9fs_vfs_create(struct mnt_idmap *idmap, struct inode *dir, 


/**

 * v9fs_vfs_mkdir - VFS mkdir hook to create a directory

 * @mnt_userns: The user namespace of the mount

 * @idmap: idmap of the mount

 * @dir:  inode that is being unlinked

 * @dentry: dentry that is being unlinked

 * @mode: mode for new directory

 *

 */



static int v9fs_vfs_mkdir(struct user_namespace *mnt_userns, struct inode *dir,

static int v9fs_vfs_mkdir(struct mnt_idmap *idmap, struct inode *dir,

			  struct dentry *dentry, umode_t mode)

{

	int err;

fs/9p/vfs_inode_dotl.c

+2 −2
Original line number Diff line number Diff line
@@ -357,14 +357,14 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry, 


/**

 * v9fs_vfs_mkdir_dotl - VFS mkdir hook to create a directory

 * @mnt_userns: The user namespace of the mount

 * @idmap: The idmap of the mount

 * @dir:  inode that is being unlinked

 * @dentry: dentry that is being unlinked

 * @omode: mode for new directory

 *

 */



static int v9fs_vfs_mkdir_dotl(struct user_namespace *mnt_userns,

static int v9fs_vfs_mkdir_dotl(struct mnt_idmap *idmap,

			       struct inode *dir, struct dentry *dentry,

			       umode_t omode)

{

fs/affs/affs.h

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ extern struct dentry *affs_lookup(struct inode *dir, struct dentry *dentry, unsi 
extern int	affs_unlink(struct inode *dir, struct dentry *dentry);

extern int	affs_create(struct mnt_idmap *idmap, struct inode *dir,

			struct dentry *dentry, umode_t mode, bool);

extern int	affs_mkdir(struct user_namespace *mnt_userns, struct inode *dir,

extern int	affs_mkdir(struct mnt_idmap *idmap, struct inode *dir,

			struct dentry *dentry, umode_t mode);

extern int	affs_rmdir(struct inode *dir, struct dentry *dentry);

extern int	affs_link(struct dentry *olddentry, struct inode *dir,