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

fs: port ->setattr() 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 abf08576

Documentation/filesystems/locking.rst

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ prototypes:: 
	void (*truncate) (struct inode *);

	int (*permission) (struct inode *, int, unsigned int);

	struct posix_acl * (*get_inode_acl)(struct inode *, int, bool);

	int (*setattr) (struct dentry *, struct iattr *);

	int (*setattr) (struct mnt_idmap *, struct dentry *, struct iattr *);

	int (*getattr) (const struct path *, struct kstat *, u32, unsigned int);

	ssize_t (*listxattr) (struct dentry *, char *, size_t);

	int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len);

Documentation/filesystems/vfs.rst

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ As of kernel 2.6.22, the following members are defined: 
					 struct delayed_call *);

		int (*permission) (struct user_namespace *, struct inode *, int);

		struct posix_acl * (*get_inode_acl)(struct inode *, int, bool);

		int (*setattr) (struct user_namespace *, struct dentry *, struct iattr *);

		int (*setattr) (struct mnt_idmap *, struct dentry *, struct iattr *);

		int (*getattr) (struct user_namespace *, const struct path *, struct kstat *, u32, unsigned int);

		ssize_t (*listxattr) (struct dentry *, char *, size_t);

		void (*update_time)(struct inode *, struct timespec *, int);

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

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ spufs_new_inode(struct super_block *sb, umode_t mode) 
}



static int

spufs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,

spufs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,

	      struct iattr *attr)

{

	struct inode *inode = d_inode(dentry);
@@ -100,7 +100,7 @@ spufs_setattr(struct user_namespace *mnt_userns, struct dentry *dentry, 
	if ((attr->ia_valid & ATTR_SIZE) &&

	    (attr->ia_size != inode->i_size))

		return -EINVAL;

	setattr_copy(&init_user_ns, inode, attr);

	setattr_copy(&nop_mnt_idmap, inode, attr);

	mark_inode_dirty(inode);

	return 0;

}

fs/9p/acl.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ int v9fs_iop_set_acl(struct user_namespace *mnt_userns, struct dentry *dentry, 
			 * FIXME should we update ctime ?

			 * What is the following setxattr update the mode ?

			 */

			v9fs_vfs_setattr_dotl(&init_user_ns, dentry, &iattr);

			v9fs_vfs_setattr_dotl(&nop_mnt_idmap, dentry, &iattr);

		}

		break;

	case ACL_TYPE_DEFAULT:

fs/9p/v9fs_vfs.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ void v9fs_inode2stat(struct inode *inode, struct p9_wstat *stat); 
int v9fs_uflags2omode(int uflags, int extended);



void v9fs_blank_wstat(struct p9_wstat *wstat);

int v9fs_vfs_setattr_dotl(struct user_namespace *mnt_userns,

int v9fs_vfs_setattr_dotl(struct mnt_idmap *idmap,

			  struct dentry *dentry, struct iattr *iattr);

int v9fs_file_fsync_dotl(struct file *filp, loff_t start, loff_t end,

			 int datasync);