Commit 6234dee7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove xfs_inobt_stage_cursor 



Just open code the two calls in the callers.

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 f6c98d92

fs/xfs/libxfs/xfs_ialloc_btree.c

+0 −14
Original line number Diff line number Diff line
@@ -489,20 +489,6 @@ xfs_inobt_init_cursor( 
	return cur;

}



/* Create an inode btree cursor with a fake root for staging. */

struct xfs_btree_cur *

xfs_inobt_stage_cursor(

	struct xfs_perag	*pag,

	struct xbtree_afakeroot	*afake,

	xfs_btnum_t		btnum)

{

	struct xfs_btree_cur	*cur;



	cur = xfs_inobt_init_cursor(pag, NULL, NULL, btnum);

	xfs_btree_stage_afakeroot(cur, afake);

	return cur;

}



/*

 * Install a new inobt btree root.  Caller is responsible for invalidating

 * and freeing the old btree blocks.

fs/xfs/libxfs/xfs_ialloc_btree.h

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ struct xfs_perag; 


extern struct xfs_btree_cur *xfs_inobt_init_cursor(struct xfs_perag *pag,

		struct xfs_trans *tp, struct xfs_buf *agbp, xfs_btnum_t btnum);

struct xfs_btree_cur *xfs_inobt_stage_cursor(struct xfs_perag *pag,

		struct xbtree_afakeroot *afake, xfs_btnum_t btnum);

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



/* ir_holemask to inode allocation bitmap conversion */

fs/xfs/scrub/ialloc_repair.c

+5 −4
Original line number Diff line number Diff line
@@ -663,8 +663,8 @@ xrep_ibt_build_new_trees( 
	ri->new_inobt.bload.claim_block = xrep_ibt_claim_block;

	ri->new_inobt.bload.get_records = xrep_ibt_get_records;



	ino_cur = xfs_inobt_stage_cursor(sc->sa.pag, &ri->new_inobt.afake,

			XFS_BTNUM_INO);

	ino_cur = xfs_inobt_init_cursor(sc->sa.pag, NULL, NULL, XFS_BTNUM_INO);

	xfs_btree_stage_afakeroot(ino_cur, &ri->new_inobt.afake);

	error = xfs_btree_bload_compute_geometry(ino_cur, &ri->new_inobt.bload,

			xfarray_length(ri->inode_records));

	if (error)
@@ -684,8 +684,9 @@ xrep_ibt_build_new_trees( 
		ri->new_finobt.bload.claim_block = xrep_fibt_claim_block;

		ri->new_finobt.bload.get_records = xrep_fibt_get_records;



		fino_cur = xfs_inobt_stage_cursor(sc->sa.pag,

				&ri->new_finobt.afake, XFS_BTNUM_FINO);

		fino_cur = xfs_inobt_init_cursor(sc->sa.pag, NULL, NULL,

				XFS_BTNUM_FINO);

		xfs_btree_stage_afakeroot(fino_cur, &ri->new_finobt.afake);

		error = xfs_btree_bload_compute_geometry(fino_cur,

				&ri->new_finobt.bload, ri->finobt_recs);

		if (error)