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

xfs: constify btree function parameters that are not modified 



Constify the rest of the btree functions that take structure and union
pointers and are not supposed to modify them.

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

fs/xfs/libxfs/xfs_btree.c

+35 −35
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ xfs_btree_check_sptr( 
static int

xfs_btree_check_ptr(

	struct xfs_btree_cur		*cur,

	union xfs_btree_ptr	*ptr,

	const union xfs_btree_ptr	*ptr,

	int				index,

	int				level)

{
@@ -936,7 +936,7 @@ xfs_btree_readahead( 
STATIC int

xfs_btree_ptr_to_daddr(

	struct xfs_btree_cur		*cur,

	union xfs_btree_ptr	*ptr,

	const union xfs_btree_ptr	*ptr,

	xfs_daddr_t			*daddr)

{

	xfs_fsblock_t		fsbno;
@@ -1013,7 +1013,7 @@ xfs_btree_setbuf( 
bool

xfs_btree_ptr_is_null(

	struct xfs_btree_cur		*cur,

	union xfs_btree_ptr	*ptr)

	const union xfs_btree_ptr	*ptr)

{

	if (cur->bc_flags & XFS_BTREE_LONG_PTRS)

		return ptr->l == cpu_to_be64(NULLFSBLOCK);
@@ -1061,7 +1061,7 @@ void 
xfs_btree_set_sibling(

	struct xfs_btree_cur		*cur,

	struct xfs_btree_block		*block,

	union xfs_btree_ptr	*ptr,

	const union xfs_btree_ptr	*ptr,

	int				lr)

{

	ASSERT(lr == XFS_BB_LEFTSIB || lr == XFS_BB_RIGHTSIB);
@@ -1230,7 +1230,7 @@ xfs_btree_set_refs( 
int

xfs_btree_get_buf_block(

	struct xfs_btree_cur		*cur,

	union xfs_btree_ptr	*ptr,

	const union xfs_btree_ptr	*ptr,

	struct xfs_btree_block		**block,

	struct xfs_buf			**bpp)

{
@@ -1258,7 +1258,7 @@ xfs_btree_get_buf_block( 
STATIC int

xfs_btree_read_buf_block(

	struct xfs_btree_cur		*cur,

	union xfs_btree_ptr	*ptr,

	const union xfs_btree_ptr	*ptr,

	int				flags,

	struct xfs_btree_block		**block,

	struct xfs_buf			**bpp)
@@ -1291,7 +1291,7 @@ void 
xfs_btree_copy_keys(

	struct xfs_btree_cur		*cur,

	union xfs_btree_key		*dst_key,

	union xfs_btree_key	*src_key,

	const union xfs_btree_key	*src_key,

	int				numkeys)

{

	ASSERT(numkeys >= 0);
@@ -1715,7 +1715,7 @@ int 
xfs_btree_lookup_get_block(

	struct xfs_btree_cur		*cur,	/* btree cursor */

	int				level,	/* level in the btree */

	union xfs_btree_ptr	*pp,	/* ptr to btree block */

	const union xfs_btree_ptr	*pp,	/* ptr to btree block */

	struct xfs_btree_block		**blkp) /* return btree block */

{

	struct xfs_buf		*bp;	/* buffer pointer for btree block */
@@ -4887,8 +4887,8 @@ xfs_btree_has_record_helper( 
int

xfs_btree_has_record(

	struct xfs_btree_cur		*cur,

	union xfs_btree_irec	*low,

	union xfs_btree_irec	*high,

	const union xfs_btree_irec	*low,

	const union xfs_btree_irec	*high,

	bool				*exists)

{

	int				error;

fs/xfs/libxfs/xfs_btree.h

+12 −9
Original line number Diff line number Diff line
@@ -503,10 +503,11 @@ union xfs_btree_key *xfs_btree_high_key_addr(struct xfs_btree_cur *cur, int n, 
union xfs_btree_ptr *xfs_btree_ptr_addr(struct xfs_btree_cur *cur, int n,

		struct xfs_btree_block *block);

int xfs_btree_lookup_get_block(struct xfs_btree_cur *cur, int level,

		union xfs_btree_ptr *pp, struct xfs_btree_block **blkp);

		const union xfs_btree_ptr *pp, struct xfs_btree_block **blkp);

struct xfs_btree_block *xfs_btree_get_block(struct xfs_btree_cur *cur,

		int level, struct xfs_buf **bpp);

bool xfs_btree_ptr_is_null(struct xfs_btree_cur *cur, union xfs_btree_ptr *ptr);

bool xfs_btree_ptr_is_null(struct xfs_btree_cur *cur,

		const union xfs_btree_ptr *ptr);

int64_t xfs_btree_diff_two_ptrs(struct xfs_btree_cur *cur,

				const union xfs_btree_ptr *a,

				const union xfs_btree_ptr *b);
@@ -517,8 +518,9 @@ void xfs_btree_get_keys(struct xfs_btree_cur *cur, 
		struct xfs_btree_block *block, union xfs_btree_key *key);

union xfs_btree_key *xfs_btree_high_key_from_key(struct xfs_btree_cur *cur,

		union xfs_btree_key *key);

int xfs_btree_has_record(struct xfs_btree_cur *cur, union xfs_btree_irec *low,

		union xfs_btree_irec *high, bool *exists);

int xfs_btree_has_record(struct xfs_btree_cur *cur,

		const union xfs_btree_irec *low,

		const union xfs_btree_irec *high, bool *exists);

bool xfs_btree_has_more_records(struct xfs_btree_cur *cur);

struct xfs_ifork *xfs_btree_ifork_ptr(struct xfs_btree_cur *cur);
@@ -541,10 +543,11 @@ xfs_btree_islastblock( 


void xfs_btree_set_ptr_null(struct xfs_btree_cur *cur,

		union xfs_btree_ptr *ptr);

int xfs_btree_get_buf_block(struct xfs_btree_cur *cur, union xfs_btree_ptr *ptr,

		struct xfs_btree_block **block, struct xfs_buf **bpp);

int xfs_btree_get_buf_block(struct xfs_btree_cur *cur,

		const union xfs_btree_ptr *ptr, struct xfs_btree_block **block,

		struct xfs_buf **bpp);

void xfs_btree_set_sibling(struct xfs_btree_cur *cur,

		struct xfs_btree_block *block, union xfs_btree_ptr *ptr,

		struct xfs_btree_block *block, const union xfs_btree_ptr *ptr,

		int lr);

void xfs_btree_init_block_cur(struct xfs_btree_cur *cur,

		struct xfs_buf *bp, int level, int numrecs);
@@ -552,7 +555,7 @@ void xfs_btree_copy_ptrs(struct xfs_btree_cur *cur, 
		union xfs_btree_ptr *dst_ptr,

		const union xfs_btree_ptr *src_ptr, int numptrs);

void xfs_btree_copy_keys(struct xfs_btree_cur *cur,

		union xfs_btree_key *dst_key, union xfs_btree_key *src_key,

		int numkeys);

		union xfs_btree_key *dst_key,

		const union xfs_btree_key *src_key, int numkeys);



#endif	/* __XFS_BTREE_H__ */