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

xfs: make the key parameters to all btree key comparison functions const 



The btree key comparison functions are not allowed to change the keys
that are passed in, so mark them const.  We'll need this for the next
patch, which adds const to the btree range query functions.

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

fs/xfs/libxfs/xfs_alloc_btree.c

+16 −16
Original line number Diff line number Diff line
@@ -230,10 +230,10 @@ xfs_allocbt_init_ptr_from_cur( 
STATIC int64_t

xfs_bnobt_key_diff(

	struct xfs_btree_cur		*cur,

	union xfs_btree_key	*key)

	const union xfs_btree_key	*key)

{

	xfs_alloc_rec_incore_t	*rec = &cur->bc_rec.a;

	xfs_alloc_key_t		*kp = &key->alloc;

	struct xfs_alloc_rec_incore	*rec = &cur->bc_rec.a;

	const struct xfs_alloc_rec	*kp = &key->alloc;



	return (int64_t)be32_to_cpu(kp->ar_startblock) - rec->ar_startblock;

}
@@ -241,10 +241,10 @@ xfs_bnobt_key_diff( 
STATIC int64_t

xfs_cntbt_key_diff(

	struct xfs_btree_cur		*cur,

	union xfs_btree_key	*key)

	const union xfs_btree_key	*key)

{

	xfs_alloc_rec_incore_t	*rec = &cur->bc_rec.a;

	xfs_alloc_key_t		*kp = &key->alloc;

	struct xfs_alloc_rec_incore	*rec = &cur->bc_rec.a;

	const struct xfs_alloc_rec	*kp = &key->alloc;

	int64_t				diff;



	diff = (int64_t)be32_to_cpu(kp->ar_blockcount) - rec->ar_blockcount;
@@ -257,8 +257,8 @@ xfs_cntbt_key_diff( 
STATIC int64_t

xfs_bnobt_diff_two_keys(

	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 (int64_t)be32_to_cpu(k1->alloc.ar_startblock) -

			  be32_to_cpu(k2->alloc.ar_startblock);
@@ -267,8 +267,8 @@ xfs_bnobt_diff_two_keys( 
STATIC int64_t

xfs_cntbt_diff_two_keys(

	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)

{

	int64_t				diff;

fs/xfs/libxfs/xfs_bmap_btree.c

+7 −7
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ xfs_bmbt_init_ptr_from_cur( 
STATIC int64_t

xfs_bmbt_key_diff(

	struct xfs_btree_cur		*cur,

	union xfs_btree_key	*key)

	const union xfs_btree_key	*key)

{

	return (int64_t)be64_to_cpu(key->bmbt.br_startoff) -

				      cur->bc_rec.b.br_startoff;
@@ -397,8 +397,8 @@ xfs_bmbt_key_diff( 
STATIC int64_t

xfs_bmbt_diff_two_keys(

	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)

{

	uint64_t			a = be64_to_cpu(k1->bmbt.br_startoff);

	uint64_t			b = be64_to_cpu(k2->bmbt.br_startoff);

fs/xfs/libxfs/xfs_btree.h

+3 −3
Original line number Diff line number Diff line
@@ -140,15 +140,15 @@ struct xfs_btree_ops { 


	/* difference between key value and cursor value */

	int64_t (*key_diff)(struct xfs_btree_cur *cur,

			      union xfs_btree_key *key);

			    const union xfs_btree_key *key);



	/*

	 * Difference between key2 and key1 -- positive if key1 > key2,

	 * negative if key1 < key2, and zero if equal.

	 */

	int64_t (*diff_two_keys)(struct xfs_btree_cur *cur,

				   union xfs_btree_key *key1,

				   union xfs_btree_key *key2);

				 const union xfs_btree_key *key1,

				 const union xfs_btree_key *key2);



	const struct xfs_buf_ops	*buf_ops;

fs/xfs/libxfs/xfs_ialloc_btree.c

+5 −5
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ xfs_finobt_init_ptr_from_cur( 
STATIC int64_t

xfs_inobt_key_diff(

	struct xfs_btree_cur		*cur,

	union xfs_btree_key	*key)

	const union xfs_btree_key	*key)

{

	return (int64_t)be32_to_cpu(key->inobt.ir_startino) -

			  cur->bc_rec.i.ir_startino;
@@ -263,8 +263,8 @@ xfs_inobt_key_diff( 
STATIC int64_t

xfs_inobt_diff_two_keys(

	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 (int64_t)be32_to_cpu(k1->inobt.ir_startino) -

			  be32_to_cpu(k2->inobt.ir_startino);

fs/xfs/libxfs/xfs_refcount_btree.c

+6 −6
Original line number Diff line number Diff line
@@ -178,10 +178,10 @@ xfs_refcountbt_init_ptr_from_cur( 
STATIC int64_t

xfs_refcountbt_key_diff(

	struct xfs_btree_cur		*cur,

	union xfs_btree_key	*key)

	const union xfs_btree_key	*key)

{

	struct xfs_refcount_irec	*rec = &cur->bc_rec.rc;

	struct xfs_refcount_key		*kp = &key->refc;

	const struct xfs_refcount_key	*kp = &key->refc;



	return (int64_t)be32_to_cpu(kp->rc_startblock) - rec->rc_startblock;

}
@@ -189,8 +189,8 @@ xfs_refcountbt_key_diff( 
STATIC int64_t

xfs_refcountbt_diff_two_keys(

	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 (int64_t)be32_to_cpu(k1->refc.rc_startblock) -

			  be32_to_cpu(k2->refc.rc_startblock);