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

xattr: remove unused argument 



his helpers is really just used to check for user.* xattr support so
don't make it pointlessly generic.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarChristian Brauner (Microsoft) <brauner@kernel.org>
parent 2db8a948

fs/nfsd/nfs4xdr.c

+1 −2
Original line number Diff line number Diff line
@@ -3444,8 +3444,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, 
		p = xdr_reserve_space(xdr, 4);

		if (!p)

			goto out_resource;

		err = xattr_supported_namespace(d_inode(dentry),

						XATTR_USER_PREFIX);

		err = xattr_supports_user_prefix(d_inode(dentry));

		*p++ = cpu_to_be32(err == 0);

	}

fs/xattr.c

+4 −6
Original line number Diff line number Diff line
@@ -160,11 +160,10 @@ xattr_permission(struct mnt_idmap *idmap, struct inode *inode, 
 * Look for any handler that deals with the specified namespace.

 */

int

xattr_supported_namespace(struct inode *inode, const char *prefix)

xattr_supports_user_prefix(struct inode *inode)

{

	const struct xattr_handler **handlers = inode->i_sb->s_xattr;

	const struct xattr_handler *handler;

	size_t preflen;



	if (!(inode->i_opflags & IOP_XATTR)) {

		if (unlikely(is_bad_inode(inode)))
@@ -172,16 +171,15 @@ xattr_supported_namespace(struct inode *inode, const char *prefix) 
		return -EOPNOTSUPP;

	}



	preflen = strlen(prefix);



	for_each_xattr_handler(handlers, handler) {

		if (!strncmp(xattr_prefix(handler), prefix, preflen))

		if (!strncmp(xattr_prefix(handler), XATTR_USER_PREFIX,

			     XATTR_USER_PREFIX_LEN))

			return 0;

	}



	return -EOPNOTSUPP;

}

EXPORT_SYMBOL(xattr_supported_namespace);

EXPORT_SYMBOL(xattr_supports_user_prefix);



int

__vfs_setxattr(struct mnt_idmap *idmap, struct dentry *dentry,

include/linux/xattr.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ int vfs_getxattr_alloc(struct mnt_idmap *idmap, 
		       struct dentry *dentry, const char *name,

		       char **xattr_value, size_t size, gfp_t flags);



int xattr_supported_namespace(struct inode *inode, const char *prefix);

int xattr_supports_user_prefix(struct inode *inode);



static inline const char *xattr_prefix(const struct xattr_handler *handler)

{