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

xfs: make the record pointer passed to query_range functions const 



The query_range functions are supposed to call a caller-supplied
function on each record found in the dataset.  These functions don't
own the memory storing the record, so don't let them change the record.

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

fs/xfs/libxfs/xfs_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -3392,7 +3392,7 @@ struct xfs_alloc_query_range_info { 
STATIC int

xfs_alloc_query_range_helper(

	struct xfs_btree_cur		*cur,

	union xfs_btree_rec		*rec,

	const union xfs_btree_rec	*rec,

	void				*priv)

{

	struct xfs_alloc_query_range_info	*query = priv;

fs/xfs/libxfs/xfs_alloc.h

+3 −3
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ xfs_extlen_t xfs_prealloc_blocks(struct xfs_mount *mp); 


typedef int (*xfs_alloc_query_range_fn)(

	struct xfs_btree_cur			*cur,

	struct xfs_alloc_rec_incore	*rec,

	const struct xfs_alloc_rec_incore	*rec,

	void					*priv);



int xfs_alloc_query_range(struct xfs_btree_cur *cur,

fs/xfs/libxfs/xfs_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -4877,7 +4877,7 @@ xfs_btree_diff_two_ptrs( 
STATIC int

xfs_btree_has_record_helper(

	struct xfs_btree_cur		*cur,

	union xfs_btree_rec		*rec,

	const union xfs_btree_rec	*rec,

	void				*priv)

{

	return -ECANCELED;

fs/xfs/libxfs/xfs_btree.h

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ unsigned long long xfs_btree_calc_size(uint *limits, unsigned long long len); 
 * code on its own.

 */

typedef int (*xfs_btree_query_range_fn)(struct xfs_btree_cur *cur,

		union xfs_btree_rec *rec, void *priv);

		const union xfs_btree_rec *rec, void *priv);



int xfs_btree_query_range(struct xfs_btree_cur *cur,

		const union xfs_btree_irec *low_rec,

fs/xfs/libxfs/xfs_ialloc.c

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ xfs_inobt_update( 
void

xfs_inobt_btrec_to_irec(

	struct xfs_mount		*mp,

	union xfs_btree_rec		*rec,

	const union xfs_btree_rec	*rec,

	struct xfs_inobt_rec_incore	*irec)

{

	irec->ir_startino = be32_to_cpu(rec->inobt.ir_startino);
@@ -2716,7 +2716,7 @@ struct xfs_ialloc_count_inodes { 
STATIC int

xfs_ialloc_count_inodes_rec(

	struct xfs_btree_cur		*cur,

	union xfs_btree_rec		*rec,

	const union xfs_btree_rec	*rec,

	void				*priv)

{

	struct xfs_inobt_rec_incore	irec;