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

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

xfs: several xattr functions can be void 



There are a handful of xattr functions which now return
nothing but zero.  They can be made void, chased through calling
functions, and error handling etc can be removed.

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 c44a1f22

fs/xfs/libxfs/xfs_attr_leaf.h

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ int xfs_attr3_leaf_add(struct xfs_buf *leaf_buffer, 
				 struct xfs_da_args *args);

int	xfs_attr3_leaf_remove(struct xfs_buf *leaf_buffer,

				    struct xfs_da_args *args);

int	xfs_attr3_leaf_list_int(struct xfs_buf *bp,

void	xfs_attr3_leaf_list_int(struct xfs_buf *bp,

				      struct xfs_attr_list_context *context);



/*

fs/xfs/xfs_attr.h

+2 −2
Original line number Diff line number Diff line
@@ -112,8 +112,8 @@ 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,

/* void; state communicated via *context */

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

			      unsigned char *, int, int);



typedef struct xfs_attr_list_context {

fs/xfs/xfs_attr_list.c

+22 −37
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context) 
	xfs_attr_sf_entry_t *sfe;

	xfs_inode_t *dp;

	int sbsize, nsbuf, count, i;

	int error;



	ASSERT(context != NULL);

	dp = context->dp;
@@ -102,13 +101,11 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context) 
	    (XFS_ISRESET_CURSOR(cursor) &&

             (dp->i_afp->if_bytes + sf->hdr.count * 16) < context->bufsize)) {

		for (i = 0, sfe = &sf->list[0]; i < sf->hdr.count; i++) {

			error = context->put_listent(context,

			context->put_listent(context,

					     sfe->flags,

					     sfe->nameval,

					     (int)sfe->namelen,

					     (int)sfe->valuelen);

			if (error)

				return error;

			/*

			 * Either search callback finished early or

			 * didn't fit it all in the buffer after all.
@@ -193,15 +190,11 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context) 
			cursor->hashval = sbp->hash;

			cursor->offset = 0;

		}

		error = context->put_listent(context,

		context->put_listent(context,

				     sbp->flags,

				     sbp->name,

				     sbp->namelen,

				     sbp->valuelen);

		if (error) {

			kmem_free(sbuf);

			return error;

		}

		if (context->seen_enough)

			break;

		cursor->offset++;
@@ -335,11 +328,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context) 
	 */

	for (;;) {

		leaf = bp->b_addr;

		error = xfs_attr3_leaf_list_int(bp, context);

		if (error) {

			xfs_trans_brelse(NULL, bp);

			return error;

		}

		xfs_attr3_leaf_list_int(bp, context);

		xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &leafhdr, leaf);

		if (context->seen_enough || leafhdr.forw == 0)

			break;
@@ -356,7 +345,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context) 
/*

 * Copy out attribute list entries for attr_list(), for leaf attribute lists.

 */

int

void

xfs_attr3_leaf_list_int(

	struct xfs_buf			*bp,

	struct xfs_attr_list_context	*context)
@@ -366,7 +355,6 @@ xfs_attr3_leaf_list_int( 
	struct xfs_attr3_icleaf_hdr	ichdr;

	struct xfs_attr_leaf_entry	*entries;

	struct xfs_attr_leaf_entry	*entry;

	int				retval;

	int				i;

	struct xfs_mount		*mp = context->dp->i_mount;
@@ -399,7 +387,7 @@ xfs_attr3_leaf_list_int( 
		}

		if (i == ichdr.count) {

			trace_xfs_attr_list_notfound(context);

			return 0;

			return;

		}

	} else {

		entry = &entries[0];
@@ -410,7 +398,6 @@ xfs_attr3_leaf_list_int( 
	/*

	 * We have found our place, start copying out the new attributes.

	 */

	retval = 0;

	for (; i < ichdr.count; entry++, i++) {

		char *name;

		int namelen, valuelen;
@@ -439,16 +426,14 @@ xfs_attr3_leaf_list_int( 
			valuelen = be32_to_cpu(name_rmt->valuelen);

		}



		retval = context->put_listent(context, entry->flags,

		context->put_listent(context, entry->flags,

					      name, namelen, valuelen);

		if (retval)

			break;

		if (context->seen_enough)

			break;

		cursor->offset++;

	}

	trace_xfs_attr_list_leaf_end(context);

	return retval;

	return;

}



/*
@@ -467,9 +452,9 @@ xfs_attr_leaf_list(xfs_attr_list_context_t *context) 
	if (error)

		return error;



	error = xfs_attr3_leaf_list_int(bp, context);

	xfs_attr3_leaf_list_int(bp, context);

	xfs_trans_brelse(NULL, bp);

	return error;

	return 0;

}



int
@@ -513,7 +498,7 @@ xfs_attr_list_int( 
 * Take care to check values and protect against them changing later,

 * we may be reading them directly out of a user buffer.

 */

STATIC int

STATIC void

xfs_attr_put_listent(

	xfs_attr_list_context_t *context,

	int		flags,
@@ -536,10 +521,10 @@ xfs_attr_put_listent( 
	 */

	if (((context->flags & ATTR_SECURE) == 0) !=

	    ((flags & XFS_ATTR_SECURE) == 0))

		return 0;

		return;

	if (((context->flags & ATTR_ROOT) == 0) !=

	    ((flags & XFS_ATTR_ROOT) == 0))

		return 0;

		return;



	arraytop = sizeof(*alist) +

			context->count * sizeof(alist->al_offset[0]);
@@ -548,7 +533,7 @@ xfs_attr_put_listent( 
		trace_xfs_attr_list_full(context);

		alist->al_more = 1;

		context->seen_enough = 1;

		return 0;

		return;

	}



	aep = (attrlist_ent_t *)&context->alist[context->firstu];
@@ -558,7 +543,7 @@ xfs_attr_put_listent( 
	alist->al_offset[context->count++] = context->firstu;

	alist->al_count = context->count;

	trace_xfs_attr_list_add(context);

	return 0;

	return;

}



/*

fs/xfs/xfs_xattr.c

+10 −13
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ const struct xattr_handler *xfs_xattr_handlers[] = { 
	NULL

};



static int

static void

__xfs_xattr_put_listent(

	struct xfs_attr_list_context *context,

	char *prefix,
@@ -148,7 +148,7 @@ __xfs_xattr_put_listent( 
	if (arraytop > context->firstu) {

		context->count = -1;	/* insufficient space */

		context->seen_enough = 1;

		return 0;

		return;

	}

	offset = (char *)context->alist + context->count;

	strncpy(offset, prefix, prefix_len);
@@ -159,10 +159,10 @@ __xfs_xattr_put_listent( 


compute_size:

	context->count += prefix_len + namelen + 1;

	return 0;

	return;

}



static int

static void

xfs_xattr_put_listent(

	struct xfs_attr_list_context *context,

	int		flags,
@@ -180,23 +180,19 @@ xfs_xattr_put_listent( 
		if (namelen == SGI_ACL_FILE_SIZE &&

		    strncmp(name, SGI_ACL_FILE,

			    SGI_ACL_FILE_SIZE) == 0) {

			int ret = __xfs_xattr_put_listent(

			__xfs_xattr_put_listent(

					context, XATTR_SYSTEM_PREFIX,

					XATTR_SYSTEM_PREFIX_LEN,

					XATTR_POSIX_ACL_ACCESS,

					strlen(XATTR_POSIX_ACL_ACCESS));

			if (ret)

				return ret;

		} else if (namelen == SGI_ACL_DEFAULT_SIZE &&

			 strncmp(name, SGI_ACL_DEFAULT,

				 SGI_ACL_DEFAULT_SIZE) == 0) {

			int ret = __xfs_xattr_put_listent(

			__xfs_xattr_put_listent(

					context, XATTR_SYSTEM_PREFIX,

					XATTR_SYSTEM_PREFIX_LEN,

					XATTR_POSIX_ACL_DEFAULT,

					strlen(XATTR_POSIX_ACL_DEFAULT));

			if (ret)

				return ret;

		}

#endif
@@ -205,7 +201,7 @@ xfs_xattr_put_listent( 
		 * see them.

		 */

		if (!capable(CAP_SYS_ADMIN))

			return 0;

			return;



		prefix = XATTR_TRUSTED_PREFIX;

		prefix_len = XATTR_TRUSTED_PREFIX_LEN;
@@ -217,8 +213,9 @@ xfs_xattr_put_listent( 
		prefix_len = XATTR_USER_PREFIX_LEN;

	}



	return __xfs_xattr_put_listent(context, prefix, prefix_len, name,

	__xfs_xattr_put_listent(context, prefix, prefix_len, name,

				namelen);

	return;

}



ssize_t