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

xattr: constify value argument in vfs_setxattr() 



Now that we don't perform translations directly in vfs_setxattr()
anymore we can constify the @value argument in vfs_setxattr(). This also
allows us to remove the hack to cast from a const in ovl_do_setxattr().

Signed-off-by: default avatarChristian Brauner (Microsoft) <brauner@kernel.org>
Reviewed-by: default avatarSeth Forshee (DigitalOcean) <sforshee@kernel.org>
parent 7e1401ac

fs/overlayfs/overlayfs.h

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static inline int ovl_do_setxattr(struct ovl_fs *ofs, struct dentry *dentry, 
				  size_t size, int flags)

{

	int err = vfs_setxattr(ovl_upper_mnt_userns(ofs), dentry, name,

			       (void *)value, size, flags);

			       value, size, flags);



	pr_debug("setxattr(%pd2, \"%s\", \"%*pE\", %zu, %d) = %i\n",

		 dentry, name, min((int)size, 48), value, size, flags, err);

fs/xattr.c

+2 −3
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static inline bool is_posix_acl_xattr(const char *name) 


int

vfs_setxattr(struct user_namespace *mnt_userns, struct dentry *dentry,

	     const char *name, void *value, size_t size, int flags)

	     const char *name, const void *value, size_t size, int flags)

{

	struct inode *inode = dentry->d_inode;

	struct inode *delegated_inode = NULL;
@@ -298,8 +298,7 @@ vfs_setxattr(struct user_namespace *mnt_userns, struct dentry *dentry, 
	int error;



	if (size && strcmp(name, XATTR_NAME_CAPS) == 0) {

		error = cap_convert_nscap(mnt_userns, dentry,

					  (const void **)&value, size);

		error = cap_convert_nscap(mnt_userns, dentry, &value, size);

		if (error < 0)

			return error;

		size = error;

include/linux/xattr.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ int __vfs_setxattr_locked(struct user_namespace *, struct dentry *, 
			  const char *, const void *, size_t, int,

			  struct inode **);

int vfs_setxattr(struct user_namespace *, struct dentry *, const char *,

		 void *, size_t, int);

		 const void *, size_t, int);

int __vfs_removexattr(struct user_namespace *, struct dentry *, const char *);

int __vfs_removexattr_locked(struct user_namespace *, struct dentry *,

			     const char *, struct inode **);