xfs: remove xfs_refcountbt_stage_cursor

Source kernel commit: a5c2194406f322e91b90fb813128541a9b4fed6a

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>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>

diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c
index c1ae7694969219030a54142e8c77e1f5669c845e..760163ca414e2e668dcab6f8d4ed52b603adff55 100644 (file)
--- a/libxfs/xfs_refcount_btree.c
+++ b/libxfs/xfs_refcount_btree.c
@@ -375,20 +375,6 @@ xfs_refcountbt_init_cursor(
        return cur;
 }
 
-/* Create a btree cursor with a fake root for staging. */
-struct xfs_btree_cur *
-xfs_refcountbt_stage_cursor(
-       struct xfs_mount        *mp,
-       struct xbtree_afakeroot *afake,
-       struct xfs_perag        *pag)
-{
-       struct xfs_btree_cur    *cur;
-
-       cur = xfs_refcountbt_init_cursor(mp, NULL, NULL, pag);
-       xfs_btree_stage_afakeroot(cur, afake);
-       return cur;
-}
-
 /*
  * Swap in the new btree root.  Once we pass this point the newly rebuilt btree
  * is in place and we have to kill off all the old btree blocks.

diff --git a/libxfs/xfs_refcount_btree.h b/libxfs/xfs_refcount_btree.h
index d66b37259bedb4dd66dc0073df34806b551c6350..1e0ab25f6c68087882a7448959f9cb3f3bd8288e 100644 (file)
--- a/libxfs/xfs_refcount_btree.h
+++ b/libxfs/xfs_refcount_btree.h
@@ -48,8 +48,6 @@ struct xbtree_afakeroot;
 extern struct xfs_btree_cur *xfs_refcountbt_init_cursor(struct xfs_mount *mp,
                struct xfs_trans *tp, struct xfs_buf *agbp,
                struct xfs_perag *pag);
-struct xfs_btree_cur *xfs_refcountbt_stage_cursor(struct xfs_mount *mp,
-               struct xbtree_afakeroot *afake, struct xfs_perag *pag);
 extern int xfs_refcountbt_maxrecs(int blocklen, bool leaf);
 extern void xfs_refcountbt_compute_maxlevels(struct xfs_mount *mp);
 

diff --git a/repair/agbtree.c b/repair/agbtree.c
index 22e31c47a827bd92c724df29cb5d582d5b03168c..395ced6cffcb8e08442d7df34feb1ec113d2b7d2 100644 (file)
--- a/repair/agbtree.c
+++ b/repair/agbtree.c
@@ -719,8 +719,8 @@ init_refc_cursor(
                return;
 
        init_rebuild(sc, &XFS_RMAP_OINFO_REFC, est_agfreeblocks, btr);
-       btr->cur = libxfs_refcountbt_stage_cursor(sc->mp, &btr->newbt.afake,
-                       pag);
+       btr->cur = libxfs_refcountbt_init_cursor(sc->mp, NULL, NULL, pag);
+       libxfs_btree_stage_afakeroot(btr->cur, &btr->newbt.afake);
 
        btr->bload.get_records = get_refcountbt_records;
        btr->bload.claim_block = rebuild_claim_block;