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

Commit 380b5dc0 authored by Nathan Scott's avatar Nathan Scott
Browse files

[XFS] Fix up an internal sort function name collision issue. 



SGI-PV: 942986
SGI-Modid: xfs-linux:xfs-kern:23859a

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent 80cce779

fs/xfs/linux-2.6/xfs_linux.h

+1 −1
Original line number Diff line number Diff line
@@ -254,11 +254,11 @@ static inline void set_buffer_unwritten_io(struct buffer_head *bh) 
#define MAX(a,b)	(max(a,b))

#define howmany(x, y)	(((x)+((y)-1))/(y))

#define roundup(x, y)	((((x)+((y)-1))/(y))*(y))

#define qsort(a,n,s,fn)	sort(a,n,s,fn,NULL)



/*

 * Various platform dependent calls that don't fit anywhere else

 */

#define xfs_sort(a,n,s,fn)	sort(a,n,s,fn,NULL)

#define xfs_stack_trace()	dump_stack()

#define xfs_itruncate_data(ip, off)	\

	(-vmtruncate(LINVFS_GET_IP(XFS_ITOV(ip)), (off)))

fs/xfs/xfs_acl.c

+3 −3
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ posix_acl_xattr_to_xfs( 
}



/*

 * Comparison function called from qsort().

 * Comparison function called from xfs_sort().

 * Primary key is ae_tag, secondary key is ae_id.

 */

STATIC int
@@ -189,7 +189,7 @@ posix_acl_xfs_to_xattr( 
		return -ERANGE;



	/* Need to sort src XFS ACL by <ae_tag,ae_id> */

	qsort(src->acl_entry, src->acl_cnt, sizeof(src->acl_entry[0]),

	xfs_sort(src->acl_entry, src->acl_cnt, sizeof(src->acl_entry[0]),

		 xfs_acl_entry_compare);



	dest->a_version = cpu_to_le32(POSIX_ACL_XATTR_VERSION);

fs/xfs/xfs_attr_leaf.c

+1 −1
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context) 
	/*

	 * Sort the entries on hash then entno.

	 */

	qsort(sbuf, nsbuf, sizeof(*sbuf), xfs_attr_shortform_compare);

	xfs_sort(sbuf, nsbuf, sizeof(*sbuf), xfs_attr_shortform_compare);



	/*

	 * Re-find our place IN THE SORTED LIST.

fs/xfs/xfs_dir2_block.c

+1 −1
Original line number Diff line number Diff line
@@ -1234,7 +1234,7 @@ xfs_dir2_sf_to_block( 
	/*

	 * Sort the leaf entries by hash value.

	 */

	qsort(blp, INT_GET(btp->count, ARCH_CONVERT), sizeof(*blp), xfs_dir2_block_sort);

	xfs_sort(blp, INT_GET(btp->count, ARCH_CONVERT), sizeof(*blp), xfs_dir2_block_sort);

	/*

	 * Log the leaf entry area and tail.

	 * Already logged the header in data_init, ignore needlog.

fs/xfs/xfs_dir_leaf.c

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ xfs_dir_shortform_getdents(xfs_inode_t *dp, uio_t *uio, int *eofp, 
	/*

	 * Sort the entries on hash then entno.

	 */

	qsort(sbuf, nsbuf, sizeof(*sbuf), xfs_dir_shortform_compare);

	xfs_sort(sbuf, nsbuf, sizeof(*sbuf), xfs_dir_shortform_compare);

	/*

	 * Stuff in last entry.

	 */