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

fs: port ->rename() 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 5ebb29be

Documentation/filesystems/locking.rst

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ prototypes:: 
	int (*mkdir) (struct mnt_idmap *, struct inode *,struct dentry *,umode_t);

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

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

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

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

			struct inode *, struct dentry *, unsigned int);

	int (*readlink) (struct dentry *, char __user *,int);

	const char *(*get_link) (struct dentry *, struct inode *, struct delayed_call *);

Documentation/filesystems/vfs.rst

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

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

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

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

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

			       struct inode *, struct dentry *, unsigned int);

		int (*readlink) (struct dentry *, char __user *,int);

		const char *(*get_link) (struct dentry *, struct inode *,

drivers/android/binderfs.c

+2 −2
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static inline bool is_binderfs_control_device(const struct dentry *dentry) 
	return info->control_dentry == dentry;

}



static int binderfs_rename(struct user_namespace *mnt_userns,

static int binderfs_rename(struct mnt_idmap *idmap,

			   struct inode *old_dir, struct dentry *old_dentry,

			   struct inode *new_dir, struct dentry *new_dentry,

			   unsigned int flags)
@@ -361,7 +361,7 @@ static int binderfs_rename(struct user_namespace *mnt_userns, 
	    is_binderfs_control_device(new_dentry))

		return -EPERM;



	return simple_rename(&init_user_ns, old_dir, old_dentry, new_dir,

	return simple_rename(idmap, old_dir, old_dentry, new_dir,

			     new_dentry, flags);

}

fs/9p/v9fs.h

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ extern struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry, 
				      unsigned int flags);

extern int v9fs_vfs_unlink(struct inode *i, struct dentry *d);

extern int v9fs_vfs_rmdir(struct inode *i, struct dentry *d);

extern int v9fs_vfs_rename(struct user_namespace *mnt_userns,

extern int v9fs_vfs_rename(struct mnt_idmap *idmap,

			   struct inode *old_dir, struct dentry *old_dentry,

			   struct inode *new_dir, struct dentry *new_dentry,

			   unsigned int flags);

fs/9p/vfs_inode.c

+2 −2
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ int v9fs_vfs_rmdir(struct inode *i, struct dentry *d) 


/**

 * v9fs_vfs_rename - VFS hook to rename an inode

 * @mnt_userns: The user namespace of the mount

 * @idmap: The idmap of the mount

 * @old_dir:  old dir inode

 * @old_dentry: old dentry

 * @new_dir: new dir inode
@@ -918,7 +918,7 @@ int v9fs_vfs_rmdir(struct inode *i, struct dentry *d) 
 */



int

v9fs_vfs_rename(struct user_namespace *mnt_userns, struct inode *old_dir,

v9fs_vfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,

		struct dentry *old_dentry, struct inode *new_dir,

		struct dentry *new_dentry, unsigned int flags)

{