Commit 1c8b9fd2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: split xfs_allocbt_init_cursor 



Split xfs_allocbt_init_cursor into separate routines for the by-bno
and by-cnt btrees to prepare for the removal of the xfs_btnum global
enumeration of btree types.

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

fs/xfs/libxfs/xfs_alloc.c

+18 −18
Original line number Diff line number Diff line
@@ -862,8 +862,8 @@ xfs_alloc_cur_setup( 
	 * attempt a small allocation.

	 */

	if (!acur->cnt)

		acur->cnt = xfs_allocbt_init_cursor(args->mp, args->tp,

					args->agbp, args->pag, XFS_BTNUM_CNT);

		acur->cnt = xfs_cntbt_init_cursor(args->mp, args->tp,

					args->agbp, args->pag);

	error = xfs_alloc_lookup_ge(acur->cnt, 0, args->maxlen, &i);

	if (error)

		return error;
@@ -872,11 +872,11 @@ xfs_alloc_cur_setup( 
	 * Allocate the bnobt left and right search cursors.

	 */

	if (!acur->bnolt)

		acur->bnolt = xfs_allocbt_init_cursor(args->mp, args->tp,

					args->agbp, args->pag, XFS_BTNUM_BNO);

		acur->bnolt = xfs_bnobt_init_cursor(args->mp, args->tp,

					args->agbp, args->pag);

	if (!acur->bnogt)

		acur->bnogt = xfs_allocbt_init_cursor(args->mp, args->tp,

					args->agbp, args->pag, XFS_BTNUM_BNO);

		acur->bnogt = xfs_bnobt_init_cursor(args->mp, args->tp,

					args->agbp, args->pag);

	return i == 1 ? 0 : -ENOSPC;

}
@@ -1234,8 +1234,8 @@ xfs_alloc_ag_vextent_exact( 
	/*

	 * Allocate/initialize a cursor for the by-number freespace btree.

	 */

	bno_cur = xfs_allocbt_init_cursor(args->mp, args->tp, args->agbp,

					  args->pag, XFS_BTNUM_BNO);

	bno_cur = xfs_bnobt_init_cursor(args->mp, args->tp, args->agbp,

					  args->pag);



	/*

	 * Lookup bno and minlen in the btree (minlen is irrelevant, really).
@@ -1295,8 +1295,8 @@ xfs_alloc_ag_vextent_exact( 
	 * We are allocating agbno for args->len

	 * Allocate/initialize a cursor for the by-size btree.

	 */

	cnt_cur = xfs_allocbt_init_cursor(args->mp, args->tp, args->agbp,

					args->pag, XFS_BTNUM_CNT);

	cnt_cur = xfs_cntbt_init_cursor(args->mp, args->tp, args->agbp,

					args->pag);

	ASSERT(args->agbno + args->len <= be32_to_cpu(agf->agf_length));

	error = xfs_alloc_fixup_trees(cnt_cur, bno_cur, fbno, flen, args->agbno,

				      args->len, XFSA_FIXUP_BNO_OK);
@@ -1710,8 +1710,8 @@ xfs_alloc_ag_vextent_size( 
	/*

	 * Allocate and initialize a cursor for the by-size btree.

	 */

	cnt_cur = xfs_allocbt_init_cursor(args->mp, args->tp, args->agbp,

					args->pag, XFS_BTNUM_CNT);

	cnt_cur = xfs_cntbt_init_cursor(args->mp, args->tp, args->agbp,

					args->pag);

	bno_cur = NULL;



	/*
@@ -1896,8 +1896,8 @@ xfs_alloc_ag_vextent_size( 
	/*

	 * Allocate and initialize a cursor for the by-block tree.

	 */

	bno_cur = xfs_allocbt_init_cursor(args->mp, args->tp, args->agbp,

					args->pag, XFS_BTNUM_BNO);

	bno_cur = xfs_bnobt_init_cursor(args->mp, args->tp, args->agbp,

					args->pag);

	if ((error = xfs_alloc_fixup_trees(cnt_cur, bno_cur, fbno, flen,

			rbno, rlen, XFSA_FIXUP_CNT_OK)))

		goto error0;
@@ -1971,7 +1971,7 @@ xfs_free_ag_extent( 
	/*

	 * Allocate and initialize a cursor for the by-block btree.

	 */

	bno_cur = xfs_allocbt_init_cursor(mp, tp, agbp, pag, XFS_BTNUM_BNO);

	bno_cur = xfs_bnobt_init_cursor(mp, tp, agbp, pag);

	/*

	 * Look for a neighboring block on the left (lower block numbers)

	 * that is contiguous with this space.
@@ -2045,7 +2045,7 @@ xfs_free_ag_extent( 
	/*

	 * Now allocate and initialize a cursor for the by-size tree.

	 */

	cnt_cur = xfs_allocbt_init_cursor(mp, tp, agbp, pag, XFS_BTNUM_CNT);

	cnt_cur = xfs_cntbt_init_cursor(mp, tp, agbp, pag);

	/*

	 * Have both left and right contiguous neighbors.

	 * Merge all three into a single free block.
@@ -2754,8 +2754,8 @@ xfs_exact_minlen_extent_available( 
	xfs_extlen_t		flen;

	int			error = 0;



	cnt_cur = xfs_allocbt_init_cursor(args->mp, args->tp, agbp,

					args->pag, XFS_BTNUM_CNT);

	cnt_cur = xfs_cntbt_init_cursor(args->mp, args->tp, agbp,

					args->pag);

	error = xfs_alloc_lookup_ge(cnt_cur, 0, args->minlen, stat);

	if (error)

		goto out;

fs/xfs/libxfs/xfs_alloc_btree.c

+44 −18
Original line number Diff line number Diff line
@@ -24,13 +24,22 @@ 
static struct kmem_cache	*xfs_allocbt_cur_cache;



STATIC struct xfs_btree_cur *

xfs_allocbt_dup_cursor(

xfs_bnobt_dup_cursor(

	struct xfs_btree_cur	*cur)

{

	return xfs_allocbt_init_cursor(cur->bc_mp, cur->bc_tp,

			cur->bc_ag.agbp, cur->bc_ag.pag, cur->bc_btnum);

	return xfs_bnobt_init_cursor(cur->bc_mp, cur->bc_tp, cur->bc_ag.agbp,

			cur->bc_ag.pag);

}



STATIC struct xfs_btree_cur *

xfs_cntbt_dup_cursor(

	struct xfs_btree_cur	*cur)

{

	return xfs_cntbt_init_cursor(cur->bc_mp, cur->bc_tp, cur->bc_ag.agbp,

			cur->bc_ag.pag);

}





STATIC void

xfs_allocbt_set_root(

	struct xfs_btree_cur		*cur,
@@ -480,7 +489,7 @@ const struct xfs_btree_ops xfs_bnobt_ops = { 
	.statoff		= XFS_STATS_CALC_INDEX(xs_abtb_2),

	.sick_mask		= XFS_SICK_AG_BNOBT,



	.dup_cursor		= xfs_allocbt_dup_cursor,

	.dup_cursor		= xfs_bnobt_dup_cursor,

	.set_root		= xfs_allocbt_set_root,

	.alloc_block		= xfs_allocbt_alloc_block,

	.free_block		= xfs_allocbt_free_block,
@@ -512,7 +521,7 @@ const struct xfs_btree_ops xfs_cntbt_ops = { 
	.statoff		= XFS_STATS_CALC_INDEX(xs_abtc_2),

	.sick_mask		= XFS_SICK_AG_CNTBT,



	.dup_cursor		= xfs_allocbt_dup_cursor,

	.dup_cursor		= xfs_cntbt_dup_cursor,

	.set_root		= xfs_allocbt_set_root,

	.alloc_block		= xfs_allocbt_alloc_block,

	.free_block		= xfs_allocbt_free_block,
@@ -532,36 +541,53 @@ const struct xfs_btree_ops xfs_cntbt_ops = { 
};



/*

 * Allocate a new allocation btree cursor.

 * Allocate a new bnobt cursor.

 *

 * For staging cursors tp and agbp are NULL.

 */

struct xfs_btree_cur *

xfs_allocbt_init_cursor(

xfs_bnobt_init_cursor(

	struct xfs_mount	*mp,

	struct xfs_trans	*tp,

	struct xfs_buf		*agbp,

	struct xfs_perag	*pag,

	xfs_btnum_t		btnum)

	struct xfs_perag	*pag)

{

	const struct xfs_btree_ops *ops = &xfs_bnobt_ops;

	struct xfs_btree_cur	*cur;



	ASSERT(btnum == XFS_BTNUM_BNO || btnum == XFS_BTNUM_CNT);

	cur = xfs_btree_alloc_cursor(mp, tp, XFS_BTNUM_BNO, &xfs_bnobt_ops,

			mp->m_alloc_maxlevels, xfs_allocbt_cur_cache);

	cur->bc_ag.pag = xfs_perag_hold(pag);

	cur->bc_ag.agbp = agbp;

	if (agbp) {

		struct xfs_agf		*agf = agbp->b_addr;



		cur->bc_nlevels = be32_to_cpu(agf->agf_bno_level);

	}

	return cur;

}



	if (btnum == XFS_BTNUM_CNT)

		ops = &xfs_cntbt_ops;

/*

 * Allocate a new cntbt cursor.

 *

 * For staging cursors tp and agbp are NULL.

 */

struct xfs_btree_cur *

xfs_cntbt_init_cursor(

	struct xfs_mount	*mp,

	struct xfs_trans	*tp,

	struct xfs_buf		*agbp,

	struct xfs_perag	*pag)

{

	struct xfs_btree_cur	*cur;



	cur = xfs_btree_alloc_cursor(mp, tp, btnum, ops, mp->m_alloc_maxlevels,

			xfs_allocbt_cur_cache);

	cur = xfs_btree_alloc_cursor(mp, tp, XFS_BTNUM_CNT, &xfs_cntbt_ops,

			mp->m_alloc_maxlevels, xfs_allocbt_cur_cache);

	cur->bc_ag.pag = xfs_perag_hold(pag);

	cur->bc_ag.agbp = agbp;

	if (agbp) {

		struct xfs_agf		*agf = agbp->b_addr;



		cur->bc_nlevels = (btnum == XFS_BTNUM_BNO) ?

			be32_to_cpu(agf->agf_bno_level) :

			be32_to_cpu(agf->agf_cnt_level);

		cur->bc_nlevels = be32_to_cpu(agf->agf_cnt_level);

	}

	return cur;

}

fs/xfs/libxfs/xfs_alloc_btree.h

+5 −2
Original line number Diff line number Diff line
@@ -47,9 +47,12 @@ struct xbtree_afakeroot; 
		 (maxrecs) * sizeof(xfs_alloc_key_t) + \

		 ((index) - 1) * sizeof(xfs_alloc_ptr_t)))



extern struct xfs_btree_cur *xfs_allocbt_init_cursor(struct xfs_mount *mp,

struct xfs_btree_cur *xfs_bnobt_init_cursor(struct xfs_mount *mp,

		struct xfs_trans *tp, struct xfs_buf *bp,

		struct xfs_perag *pag, xfs_btnum_t btnum);

		struct xfs_perag *pag);

struct xfs_btree_cur *xfs_cntbt_init_cursor(struct xfs_mount *mp,

		struct xfs_trans *tp, struct xfs_buf *bp,

		struct xfs_perag *pag);

extern int xfs_allocbt_maxrecs(struct xfs_mount *, int, int);

extern xfs_extlen_t xfs_allocbt_calc_size(struct xfs_mount *mp,

		unsigned long long len);

fs/xfs/scrub/agheader_repair.c

+4 −8
Original line number Diff line number Diff line
@@ -255,8 +255,7 @@ xrep_agf_calc_from_btrees( 
	int			error;



	/* Update the AGF counters from the bnobt. */

	cur = xfs_allocbt_init_cursor(mp, sc->tp, agf_bp,

			sc->sa.pag, XFS_BTNUM_BNO);

	cur = xfs_bnobt_init_cursor(mp, sc->tp, agf_bp, sc->sa.pag);

	error = xfs_alloc_query_all(cur, xrep_agf_walk_allocbt, &raa);

	if (error)

		goto err;
@@ -269,8 +268,7 @@ xrep_agf_calc_from_btrees( 
	agf->agf_longest = cpu_to_be32(raa.longest);



	/* Update the AGF counters from the cntbt. */

	cur = xfs_allocbt_init_cursor(mp, sc->tp, agf_bp,

			sc->sa.pag, XFS_BTNUM_CNT);

	cur = xfs_cntbt_init_cursor(mp, sc->tp, agf_bp, sc->sa.pag);

	error = xfs_btree_count_blocks(cur, &blocks);

	if (error)

		goto err;
@@ -549,16 +547,14 @@ xrep_agfl_collect_blocks( 
		goto out_bmp;



	/* Find all blocks currently being used by the bnobt. */

	cur = xfs_allocbt_init_cursor(mp, sc->tp, agf_bp,

			sc->sa.pag, XFS_BTNUM_BNO);

	cur = xfs_bnobt_init_cursor(mp, sc->tp, agf_bp, sc->sa.pag);

	error = xagb_bitmap_set_btblocks(&ra.agmetablocks, cur);

	xfs_btree_del_cursor(cur, error);

	if (error)

		goto out_bmp;



	/* Find all blocks currently being used by the cntbt. */

	cur = xfs_allocbt_init_cursor(mp, sc->tp, agf_bp,

			sc->sa.pag, XFS_BTNUM_CNT);

	cur = xfs_cntbt_init_cursor(mp, sc->tp, agf_bp, sc->sa.pag);

	error = xagb_bitmap_set_btblocks(&ra.agmetablocks, cur);

	xfs_btree_del_cursor(cur, error);

	if (error)

fs/xfs/scrub/alloc_repair.c

+2 −4
Original line number Diff line number Diff line
@@ -735,12 +735,10 @@ xrep_abt_build_new_trees( 
	ra->new_cntbt.bload.claim_block = xrep_abt_claim_block;



	/* Allocate cursors for the staged btrees. */

	bno_cur = xfs_allocbt_init_cursor(sc->mp, NULL, NULL, pag,

			XFS_BTNUM_BNO);

	bno_cur = xfs_bnobt_init_cursor(sc->mp, NULL, NULL, pag);

	xfs_btree_stage_afakeroot(bno_cur, &ra->new_bnobt.afake);



	cnt_cur = xfs_allocbt_init_cursor(sc->mp, NULL, NULL, pag,

			XFS_BTNUM_CNT);

	cnt_cur = xfs_cntbt_init_cursor(sc->mp, NULL, NULL, pag);

	xfs_btree_stage_afakeroot(cnt_cur, &ra->new_cntbt.afake);



	/* Last chance to abort before we start committing fixes. */