xfs: remove xfs_allocbt_stage_cursor

Just open code the two calls in the callers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_alloc_btree.c b/fs/xfs/libxfs/xfs_alloc_btree.c
index 847674658d675445420e1be8fb8d0c96a4906c57..99859803bb0b8ec11d20982e249fbf8ea67d96a5 100644 (file)
--- a/fs/xfs/libxfs/xfs_alloc_btree.c
+++ b/fs/xfs/libxfs/xfs_alloc_btree.c
@@ -548,21 +548,6 @@ xfs_allocbt_init_cursor(
        return cur;
 }
 
-/* Create a free space btree cursor with a fake root for staging. */
-struct xfs_btree_cur *
-xfs_allocbt_stage_cursor(
-       struct xfs_mount        *mp,
-       struct xbtree_afakeroot *afake,
-       struct xfs_perag        *pag,
-       xfs_btnum_t             btnum)
-{
-       struct xfs_btree_cur    *cur;
-
-       cur = xfs_allocbt_init_cursor(mp, NULL, NULL, pag, btnum);
-       xfs_btree_stage_afakeroot(cur, afake);
-       return cur;
-}
-
 /*
  * Install a new free space btree root.  Caller is responsible for invalidating
  * and freeing the old btree blocks.

diff --git a/fs/xfs/libxfs/xfs_alloc_btree.h b/fs/xfs/libxfs/xfs_alloc_btree.h
index 45df893ef6bb00d473f717061ac1ca417ed0a39f..1c910862535f7a3436c538b3498be2da73a4d111 100644 (file)
--- a/fs/xfs/libxfs/xfs_alloc_btree.h
+++ b/fs/xfs/libxfs/xfs_alloc_btree.h
@@ -50,9 +50,6 @@ struct xbtree_afakeroot;
 extern struct xfs_btree_cur *xfs_allocbt_init_cursor(struct xfs_mount *mp,
                struct xfs_trans *tp, struct xfs_buf *bp,
                struct xfs_perag *pag, xfs_btnum_t btnum);
-struct xfs_btree_cur *xfs_allocbt_stage_cursor(struct xfs_mount *mp,
-               struct xbtree_afakeroot *afake, struct xfs_perag *pag,
-               xfs_btnum_t btnum);
 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);

diff --git a/fs/xfs/scrub/alloc_repair.c b/fs/xfs/scrub/alloc_repair.c
index 45edda096869c7f46554531f08249f7be4a24024..544c53d450ce2629c0b2b5e34f85cba9f61322fe 100644 (file)
--- a/fs/xfs/scrub/alloc_repair.c
+++ b/fs/xfs/scrub/alloc_repair.c
@@ -735,10 +735,13 @@ 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_stage_cursor(sc->mp, &ra->new_bnobt.afake,
-                       pag, XFS_BTNUM_BNO);
-       cnt_cur = xfs_allocbt_stage_cursor(sc->mp, &ra->new_cntbt.afake,
-                       pag, XFS_BTNUM_CNT);
+       bno_cur = xfs_allocbt_init_cursor(sc->mp, NULL, NULL, pag,
+                       XFS_BTNUM_BNO);
+       xfs_btree_stage_afakeroot(bno_cur, &ra->new_bnobt.afake);
+
+       cnt_cur = xfs_allocbt_init_cursor(sc->mp, NULL, NULL, pag,
+                       XFS_BTNUM_CNT);
+       xfs_btree_stage_afakeroot(cnt_cur, &ra->new_cntbt.afake);
 
        /* Last chance to abort before we start committing fixes. */
        if (xchk_should_terminate(sc, &error))