xfs: remove xfs_inobt_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_ialloc_btree.c b/fs/xfs/libxfs/xfs_ialloc_btree.c
index 48bfea0e2a2009d9899452cc984915cdb34a2366..b45a2e5813133133b16a9b4672708c2025ffa9a2 100644 (file)
--- a/fs/xfs/libxfs/xfs_ialloc_btree.c
+++ b/fs/xfs/libxfs/xfs_ialloc_btree.c
@@ -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.

diff --git a/fs/xfs/libxfs/xfs_ialloc_btree.h b/fs/xfs/libxfs/xfs_ialloc_btree.h
index 3262c3fe5ebee0e023acd9f29c8ee1592ea69e2b..40f0fc0e8da37790eee192cbf03d78314362b942 100644 (file)
--- a/fs/xfs/libxfs/xfs_ialloc_btree.h
+++ b/fs/xfs/libxfs/xfs_ialloc_btree.h
@@ -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 */

diff --git a/fs/xfs/scrub/ialloc_repair.c b/fs/xfs/scrub/ialloc_repair.c
index e94f10800082565c069e75a7f865c3d3e81a7063..04e186d8c7386e49472d36c2399c328f5385bd80 100644 (file)
--- a/fs/xfs/scrub/ialloc_repair.c
+++ b/fs/xfs/scrub/ialloc_repair.c
@@ -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)