Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 561f7d17 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Lachlan McIlroy
Browse files

[XFS] split up xfs_btree_init_cursor 



xfs_btree_init_cursor contains close to little shared code for the
different btrees and will get even more non-common code in the future.
Split it up into one routine per btree type.

Because xfs_btree_dup_cursor needs to call the init routine for a generic
btree cursor add a new btree operation vector that contains a dup_cursor
method that initializes a new cursor based on an existing one.

The btree operations vector is based on an idea and code from Dave Chinner
and will grow more entries later during this series.

SGI-PV: 985583

SGI-Modid: xfs-linux-melb:xfs-kern:32176a

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: default avatarBill O'Donnell <billodo@sgi.com>
Signed-off-by: default avatarDavid Chinner <david@fromorbit.com>
parent f2277f06

fs/xfs/xfs_alloc.c

+16 −18
Original line number Diff line number Diff line
@@ -640,8 +640,8 @@ xfs_alloc_ag_vextent_exact( 
	/*

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

	 */

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

		args->agno, XFS_BTNUM_BNO, NULL, 0);

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

		args->agno, XFS_BTNUM_BNO);

	/*

	 * Lookup bno and minlen in the btree (minlen is irrelevant, really).

	 * Look for the closest free block <= bno, it must contain bno
@@ -696,8 +696,8 @@ xfs_alloc_ag_vextent_exact( 
	 * We are allocating agbno for rlen [agbno .. end]

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

	 */

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

		args->agno, XFS_BTNUM_CNT, NULL, 0);

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

		args->agno, XFS_BTNUM_CNT);

	ASSERT(args->agbno + args->len <=

		be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));

	if ((error = xfs_alloc_fixup_trees(cnt_cur, bno_cur, fbno, flen,
@@ -759,8 +759,8 @@ xfs_alloc_ag_vextent_near( 
	/*

	 * Get a cursor for the by-size btree.

	 */

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

		args->agno, XFS_BTNUM_CNT, NULL, 0);

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

		args->agno, XFS_BTNUM_CNT);

	ltlen = 0;

	bno_cur_lt = bno_cur_gt = NULL;

	/*
@@ -886,8 +886,8 @@ xfs_alloc_ag_vextent_near( 
		/*

		 * Set up a cursor for the by-bno tree.

		 */

		bno_cur_lt = xfs_btree_init_cursor(args->mp, args->tp,

			args->agbp, args->agno, XFS_BTNUM_BNO, NULL, 0);

		bno_cur_lt = xfs_allocbt_init_cursor(args->mp, args->tp,

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

		/*

		 * Fix up the btree entries.

		 */
@@ -914,8 +914,8 @@ xfs_alloc_ag_vextent_near( 
	/*

	 * Allocate and initialize the cursor for the leftward search.

	 */

	bno_cur_lt = xfs_btree_init_cursor(args->mp, args->tp, args->agbp,

		args->agno, XFS_BTNUM_BNO, NULL, 0);

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

		args->agno, XFS_BTNUM_BNO);

	/*

	 * Lookup <= bno to find the leftward search's starting point.

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

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

	 */

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

		args->agno, XFS_BTNUM_CNT, NULL, 0);

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

		args->agno, XFS_BTNUM_CNT);

	bno_cur = NULL;

	/*

	 * Look for an entry >= maxlen+alignment-1 blocks.
@@ -1372,8 +1372,8 @@ xfs_alloc_ag_vextent_size( 
	/*

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

	 */

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

		args->agno, XFS_BTNUM_BNO, NULL, 0);

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

		args->agno, XFS_BTNUM_BNO);

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

			rbno, rlen, XFSA_FIXUP_CNT_OK)))

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

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

	 */

	bno_cur = xfs_btree_init_cursor(mp, tp, agbp, agno, XFS_BTNUM_BNO, NULL,

		0);

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

	cnt_cur = NULL;

	/*

	 * Look for a neighboring block on the left (lower block numbers)
@@ -1575,8 +1574,7 @@ xfs_free_ag_extent( 
	/*

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

	 */

	cnt_cur = xfs_btree_init_cursor(mp, tp, agbp, agno, XFS_BTNUM_CNT, NULL,

		0);

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

	/*

	 * Have both left and right contiguous neighbors.

	 * Merge all three into a single free block.

fs/xfs/xfs_alloc_btree.c

+45 −0
Original line number Diff line number Diff line
@@ -2209,3 +2209,48 @@ xfs_alloc_update( 
	}

	return 0;

}



STATIC struct xfs_btree_cur *

xfs_allocbt_dup_cursor(

	struct xfs_btree_cur	*cur)

{

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

			cur->bc_private.a.agbp, cur->bc_private.a.agno,

			cur->bc_btnum);

}



static const struct xfs_btree_ops xfs_allocbt_ops = {

	.dup_cursor		= xfs_allocbt_dup_cursor,

};



/*

 * Allocate a new allocation btree cursor.

 */

struct xfs_btree_cur *			/* new alloc btree cursor */

xfs_allocbt_init_cursor(

	struct xfs_mount	*mp,		/* file system mount point */

	struct xfs_trans	*tp,		/* transaction pointer */

	struct xfs_buf		*agbp,		/* buffer for agf structure */

	xfs_agnumber_t		agno,		/* allocation group number */

	xfs_btnum_t		btnum)		/* btree identifier */

{

	struct xfs_agf		*agf = XFS_BUF_TO_AGF(agbp);

	struct xfs_btree_cur	*cur;



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



	cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_SLEEP);



	cur->bc_tp = tp;

	cur->bc_mp = mp;

	cur->bc_nlevels = be32_to_cpu(agf->agf_levels[btnum]);

	cur->bc_btnum = btnum;

	cur->bc_blocklog = mp->m_sb.sb_blocklog;



	cur->bc_ops = &xfs_allocbt_ops;



	cur->bc_private.a.agbp = agbp;

	cur->bc_private.a.agno = agno;



	return cur;

}

fs/xfs/xfs_alloc_btree.h

+5 −0
Original line number Diff line number Diff line
@@ -152,4 +152,9 @@ extern int xfs_alloc_lookup_le(struct xfs_btree_cur *cur, xfs_agblock_t bno, 
extern int xfs_alloc_update(struct xfs_btree_cur *cur, xfs_agblock_t bno,

				xfs_extlen_t len);





extern struct xfs_btree_cur *xfs_allocbt_init_cursor(struct xfs_mount *,

		struct xfs_trans *, struct xfs_buf *,

		xfs_agnumber_t, xfs_btnum_t);



#endif	/* __XFS_ALLOC_BTREE_H__ */

fs/xfs/xfs_bmap.c

+6 −11
Original line number Diff line number Diff line
@@ -422,8 +422,7 @@ xfs_bmap_add_attrfork_btree( 
	if (ip->i_df.if_broot_bytes <= XFS_IFORK_DSIZE(ip))

		*flags |= XFS_ILOG_DBROOT;

	else {

		cur = xfs_btree_init_cursor(mp, tp, NULL, 0, XFS_BTNUM_BMAP, ip,

			XFS_DATA_FORK);

		cur = xfs_bmbt_init_cursor(mp, tp, ip, XFS_DATA_FORK);

		cur->bc_private.b.flist = flist;

		cur->bc_private.b.firstblock = *firstblock;

		if ((error = xfs_bmbt_lookup_ge(cur, 0, 0, 0, &stat)))
@@ -3441,8 +3440,7 @@ xfs_bmap_extents_to_btree( 
	 * Need a cursor.  Can't allocate until bb_level is filled in.

	 */

	mp = ip->i_mount;

	cur = xfs_btree_init_cursor(mp, tp, NULL, 0, XFS_BTNUM_BMAP, ip,

		whichfork);

	cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);

	cur->bc_private.b.firstblock = *firstblock;

	cur->bc_private.b.flist = flist;

	cur->bc_private.b.flags = wasdel ? XFS_BTCUR_BPRV_WASDEL : 0;
@@ -5029,8 +5027,7 @@ xfs_bmapi( 
				if (abno == NULLFSBLOCK)

					break;

				if ((ifp->if_flags & XFS_IFBROOT) && !cur) {

					cur = xfs_btree_init_cursor(mp,

						tp, NULL, 0, XFS_BTNUM_BMAP,

					cur = xfs_bmbt_init_cursor(mp, tp,

						ip, whichfork);

					cur->bc_private.b.firstblock =

						*firstblock;
@@ -5147,9 +5144,8 @@ xfs_bmapi( 
			 */

			ASSERT(mval->br_blockcount <= len);

			if ((ifp->if_flags & XFS_IFBROOT) && !cur) {

				cur = xfs_btree_init_cursor(mp,

					tp, NULL, 0, XFS_BTNUM_BMAP,

					ip, whichfork);

				cur = xfs_bmbt_init_cursor(mp,

					tp, ip, whichfork);

				cur->bc_private.b.firstblock =

					*firstblock;

				cur->bc_private.b.flist = flist;
@@ -5440,8 +5436,7 @@ xfs_bunmapi( 
	logflags = 0;

	if (ifp->if_flags & XFS_IFBROOT) {

		ASSERT(XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_BTREE);

		cur = xfs_btree_init_cursor(mp, tp, NULL, 0, XFS_BTNUM_BMAP, ip,

			whichfork);

		cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);

		cur->bc_private.b.firstblock = *firstblock;

		cur->bc_private.b.flist = flist;

		cur->bc_private.b.flags = 0;

fs/xfs/xfs_bmap_btree.c

+59 −0
Original line number Diff line number Diff line
@@ -2608,3 +2608,62 @@ xfs_check_nostate_extents( 
	}

	return 0;

}





STATIC struct xfs_btree_cur *

xfs_bmbt_dup_cursor(

	struct xfs_btree_cur	*cur)

{

	struct xfs_btree_cur	*new;



	new = xfs_bmbt_init_cursor(cur->bc_mp, cur->bc_tp,

			cur->bc_private.b.ip, cur->bc_private.b.whichfork);



	/*

	 * Copy the firstblock, flist, and flags values,

	 * since init cursor doesn't get them.

	 */

	new->bc_private.b.firstblock = cur->bc_private.b.firstblock;

	new->bc_private.b.flist = cur->bc_private.b.flist;

	new->bc_private.b.flags = cur->bc_private.b.flags;



	return new;

}



static const struct xfs_btree_ops xfs_bmbt_ops = {

	.dup_cursor		= xfs_bmbt_dup_cursor,

};



/*

 * Allocate a new bmap btree cursor.

 */

struct xfs_btree_cur *				/* new bmap btree cursor */

xfs_bmbt_init_cursor(

	struct xfs_mount	*mp,		/* file system mount point */

	struct xfs_trans	*tp,		/* transaction pointer */

	struct xfs_inode	*ip,		/* inode owning the btree */

	int			whichfork)	/* data or attr fork */

{

	struct xfs_ifork	*ifp = XFS_IFORK_PTR(ip, whichfork);

	struct xfs_btree_cur	*cur;



	cur = kmem_zone_zalloc(xfs_btree_cur_zone, KM_SLEEP);



	cur->bc_tp = tp;

	cur->bc_mp = mp;

	cur->bc_nlevels = be16_to_cpu(ifp->if_broot->bb_level) + 1;

	cur->bc_btnum = XFS_BTNUM_BMAP;

	cur->bc_blocklog = mp->m_sb.sb_blocklog;



	cur->bc_ops = &xfs_bmbt_ops;



	cur->bc_private.b.forksize = XFS_IFORK_SIZE(ip, whichfork);

	cur->bc_private.b.ip = ip;

	cur->bc_private.b.firstblock = NULLFSBLOCK;

	cur->bc_private.b.flist = NULL;

	cur->bc_private.b.allocated = 0;

	cur->bc_private.b.flags = 0;

	cur->bc_private.b.whichfork = whichfork;



	return cur;

}