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

xfs: refactor converting btree irec to btree key 



We keep doing these conversions to support btree queries, so refactor
this into a helper.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 2bea8df0

fs/xfs/libxfs/xfs_btree.c

+15 −8
Original line number Diff line number Diff line
@@ -4937,6 +4937,19 @@ xfs_btree_overlapped_query_range( 
	return error;

}



static inline void

xfs_btree_key_from_irec(

	struct xfs_btree_cur		*cur,

	union xfs_btree_key		*key,

	const union xfs_btree_irec	*irec)

{

	union xfs_btree_rec		rec;



	cur->bc_rec = *irec;

	cur->bc_ops->init_rec_from_cur(cur, &rec);

	cur->bc_ops->init_key_from_rec(key, &rec);

}



/*

 * Query a btree for all records overlapping a given interval of keys.  The

 * supplied function will be called with each record found; return one of the
@@ -4951,18 +4964,12 @@ xfs_btree_query_range( 
	xfs_btree_query_range_fn	fn,

	void				*priv)

{

	union xfs_btree_rec		rec;

	union xfs_btree_key		low_key;

	union xfs_btree_key		high_key;



	/* Find the keys of both ends of the interval. */

	cur->bc_rec = *high_rec;

	cur->bc_ops->init_rec_from_cur(cur, &rec);

	cur->bc_ops->init_key_from_rec(&high_key, &rec);



	cur->bc_rec = *low_rec;

	cur->bc_ops->init_rec_from_cur(cur, &rec);

	cur->bc_ops->init_key_from_rec(&low_key, &rec);

	xfs_btree_key_from_irec(cur, &high_key, high_rec);

	xfs_btree_key_from_irec(cur, &low_key, low_rec);



	/* Enforce low key < high key. */

	if (cur->bc_ops->diff_two_keys(cur, &low_key, &high_key) > 0)