Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5bd12bf authored by Eric Sandeen's avatar Eric Sandeen Committed by Dave Chinner
Browse files

xfs: don't pass value into attr ->put_listent 



The value is not used; only names and value lengths are
returned.  Remove the argument.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 2a6fba6d

fs/xfs/xfs_attr.h

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ typedef struct attrlist_cursor_kern { 


/* Return 0 on success, or -errno; other state communicated via *context */

typedef int (*put_listent_func_t)(struct xfs_attr_list_context *, int,

			      unsigned char *, int, int, unsigned char *);

			      unsigned char *, int, int);



typedef struct xfs_attr_list_context {

	struct xfs_inode		*dp;		/* inode */

fs/xfs/xfs_attr_list.c

+6 −12
Original line number Diff line number Diff line
@@ -106,8 +106,7 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context) 
					   sfe->flags,

					   sfe->nameval,

					   (int)sfe->namelen,

					   (int)sfe->valuelen,

					   &sfe->nameval[sfe->namelen]);

					   (int)sfe->valuelen);

			if (error)

				return error;

			/*
@@ -198,8 +197,7 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context) 
					sbp->flags,

					sbp->name,

					sbp->namelen,

					sbp->valuelen,

					&sbp->name[sbp->namelen]);

					sbp->valuelen);

		if (error) {

			kmem_free(sbuf);

			return error;
@@ -430,8 +428,7 @@ xfs_attr3_leaf_list_int( 
						entry->flags,

						name_loc->nameval,

						(int)name_loc->namelen,

						be16_to_cpu(name_loc->valuelen),

						&name_loc->nameval[name_loc->namelen]);

						be16_to_cpu(name_loc->valuelen));

			if (retval)

				return retval;

		} else {
@@ -459,16 +456,14 @@ xfs_attr3_leaf_list_int( 
							entry->flags,

							name_rmt->name,

							(int)name_rmt->namelen,

							valuelen,

							args.value);

							valuelen);

				kmem_free(args.value);

			} else {

				retval = context->put_listent(context,

						entry->flags,

						name_rmt->name,

						(int)name_rmt->namelen,

						valuelen,

						NULL);

						valuelen);

			}

			if (retval)

				return retval;
@@ -549,8 +544,7 @@ xfs_attr_put_listent( 
	int		flags,

	unsigned char	*name,

	int		namelen,

	int		valuelen,

	unsigned char	*value)

	int		valuelen)

{

	struct attrlist *alist = (struct attrlist *)context->alist;

	attrlist_ent_t *aep;

fs/xfs/xfs_xattr.c

+1 −2
Original line number Diff line number Diff line
@@ -166,8 +166,7 @@ xfs_xattr_put_listent( 
	int		flags,

	unsigned char	*name,

	int		namelen,

	int		valuelen,

	unsigned char	*value)

	int		valuelen)

{

	char *prefix;

	int prefix_len;