Commit 8e38dc88 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: make the keys and records passed to btree inorder functions const 



The inorder functions are simple predicates, which means that they don't
modify the parameters.  Mark them all const.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 23825cd1

fs/xfs/libxfs/xfs_alloc_btree.c

+12 −12
Original line number Diff line number Diff line
@@ -377,8 +377,8 @@ const struct xfs_buf_ops xfs_cntbt_buf_ops = { 
STATIC int

xfs_bnobt_keys_inorder(

	struct xfs_btree_cur		*cur,

	union xfs_btree_key	*k1,

	union xfs_btree_key	*k2)

	const union xfs_btree_key	*k1,

	const union xfs_btree_key	*k2)

{

	return be32_to_cpu(k1->alloc.ar_startblock) <

	       be32_to_cpu(k2->alloc.ar_startblock);
@@ -387,8 +387,8 @@ xfs_bnobt_keys_inorder( 
STATIC int

xfs_bnobt_recs_inorder(

	struct xfs_btree_cur		*cur,

	union xfs_btree_rec	*r1,

	union xfs_btree_rec	*r2)

	const union xfs_btree_rec	*r1,

	const union xfs_btree_rec	*r2)

{

	return be32_to_cpu(r1->alloc.ar_startblock) +

		be32_to_cpu(r1->alloc.ar_blockcount) <=
@@ -398,8 +398,8 @@ xfs_bnobt_recs_inorder( 
STATIC int

xfs_cntbt_keys_inorder(

	struct xfs_btree_cur		*cur,

	union xfs_btree_key	*k1,

	union xfs_btree_key	*k2)

	const union xfs_btree_key	*k1,

	const union xfs_btree_key	*k2)

{

	return be32_to_cpu(k1->alloc.ar_blockcount) <

		be32_to_cpu(k2->alloc.ar_blockcount) ||
@@ -411,8 +411,8 @@ xfs_cntbt_keys_inorder( 
STATIC int

xfs_cntbt_recs_inorder(

	struct xfs_btree_cur		*cur,

	union xfs_btree_rec	*r1,

	union xfs_btree_rec	*r2)

	const union xfs_btree_rec	*r1,

	const union xfs_btree_rec	*r2)

{

	return be32_to_cpu(r1->alloc.ar_blockcount) <

		be32_to_cpu(r2->alloc.ar_blockcount) ||

fs/xfs/libxfs/xfs_bmap_btree.c

+6 −6
Original line number Diff line number Diff line
@@ -498,8 +498,8 @@ const struct xfs_buf_ops xfs_bmbt_buf_ops = { 
STATIC int

xfs_bmbt_keys_inorder(

	struct xfs_btree_cur		*cur,

	union xfs_btree_key	*k1,

	union xfs_btree_key	*k2)

	const union xfs_btree_key	*k1,

	const union xfs_btree_key	*k2)

{

	return be64_to_cpu(k1->bmbt.br_startoff) <

		be64_to_cpu(k2->bmbt.br_startoff);
@@ -508,8 +508,8 @@ xfs_bmbt_keys_inorder( 
STATIC int

xfs_bmbt_recs_inorder(

	struct xfs_btree_cur		*cur,

	union xfs_btree_rec	*r1,

	union xfs_btree_rec	*r2)

	const union xfs_btree_rec	*r1,

	const union xfs_btree_rec	*r2)

{

	return xfs_bmbt_disk_get_startoff(&r1->bmbt) +

		xfs_bmbt_disk_get_blockcount(&r1->bmbt) <=

fs/xfs/libxfs/xfs_btree.h

+4 −4
Original line number Diff line number Diff line
@@ -154,13 +154,13 @@ struct xfs_btree_ops { 


	/* check that k1 is lower than k2 */

	int	(*keys_inorder)(struct xfs_btree_cur *cur,

				union xfs_btree_key *k1,

				union xfs_btree_key *k2);

				const union xfs_btree_key *k1,

				const union xfs_btree_key *k2);



	/* check that r1 is lower than r2 */

	int	(*recs_inorder)(struct xfs_btree_cur *cur,

				union xfs_btree_rec *r1,

				union xfs_btree_rec *r2);

				const union xfs_btree_rec *r1,

				const union xfs_btree_rec *r2);

};



/*

fs/xfs/libxfs/xfs_ialloc_btree.c

+6 −6
Original line number Diff line number Diff line
@@ -361,8 +361,8 @@ const struct xfs_buf_ops xfs_finobt_buf_ops = { 
STATIC int

xfs_inobt_keys_inorder(

	struct xfs_btree_cur		*cur,

	union xfs_btree_key	*k1,

	union xfs_btree_key	*k2)

	const union xfs_btree_key	*k1,

	const union xfs_btree_key	*k2)

{

	return be32_to_cpu(k1->inobt.ir_startino) <

		be32_to_cpu(k2->inobt.ir_startino);
@@ -371,8 +371,8 @@ xfs_inobt_keys_inorder( 
STATIC int

xfs_inobt_recs_inorder(

	struct xfs_btree_cur		*cur,

	union xfs_btree_rec	*r1,

	union xfs_btree_rec	*r2)

	const union xfs_btree_rec	*r1,

	const union xfs_btree_rec	*r2)

{

	return be32_to_cpu(r1->inobt.ir_startino) + XFS_INODES_PER_CHUNK <=

		be32_to_cpu(r2->inobt.ir_startino);

fs/xfs/libxfs/xfs_refcount_btree.c

+6 −6
Original line number Diff line number Diff line
@@ -270,8 +270,8 @@ const struct xfs_buf_ops xfs_refcountbt_buf_ops = { 
STATIC int

xfs_refcountbt_keys_inorder(

	struct xfs_btree_cur		*cur,

	union xfs_btree_key	*k1,

	union xfs_btree_key	*k2)

	const union xfs_btree_key	*k1,

	const union xfs_btree_key	*k2)

{

	return be32_to_cpu(k1->refc.rc_startblock) <

	       be32_to_cpu(k2->refc.rc_startblock);
@@ -280,8 +280,8 @@ xfs_refcountbt_keys_inorder( 
STATIC int

xfs_refcountbt_recs_inorder(

	struct xfs_btree_cur		*cur,

	union xfs_btree_rec	*r1,

	union xfs_btree_rec	*r2)

	const union xfs_btree_rec	*r1,

	const union xfs_btree_rec	*r2)

{

	return  be32_to_cpu(r1->refc.rc_startblock) +

		be32_to_cpu(r1->refc.rc_blockcount) <=