Commit 2f014aad authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: open code ATTR_ENTSIZE 



Replace a single use macro containing open-coded variants of
standard helpers with direct calls to the standard helpers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChandan Rajendra <chandanrlinux@gmail.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent fe960087

fs/xfs/xfs_attr_list.c

+4 −7
Original line number Diff line number Diff line
@@ -545,12 +545,6 @@ xfs_attr_list_int( 
	return error;

}



#define	ATTR_ENTBASESIZE		/* minimum bytes used by an attr */ \

	(((struct attrlist_ent *) 0)->a_name - (char *) 0)

#define	ATTR_ENTSIZE(namelen)		/* actual bytes used by an attr */ \

	((ATTR_ENTBASESIZE + (namelen) + 1 + sizeof(uint32_t)-1) \

	 & ~(sizeof(uint32_t)-1))



/*

 * Format an attribute and copy it out to the user's buffer.

 * Take care to check values and protect against them changing later,
@@ -586,7 +580,10 @@ xfs_attr_put_listent( 


	arraytop = sizeof(*alist) +

			context->count * sizeof(alist->al_offset[0]);

	context->firstu -= ATTR_ENTSIZE(namelen);



	/* decrement by the actual bytes used by the attr */

	context->firstu -= round_up(offsetof(struct attrlist_ent, a_name) +

			namelen + 1, sizeof(uint32_t));

	if (context->firstu < arraytop) {

		trace_xfs_attr_list_full(context);

		alist->al_more = 1;