xfs: remove xfs_bmbt_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_bmap_btree.c b/fs/xfs/libxfs/xfs_bmap_btree.c
index c338c5be4c67a3e660035db5871476ad0aa094d5..1104bf4098e2ea2d280428a198ac0f5b0b1de26e 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap_btree.c
+++ b/fs/xfs/libxfs/xfs_bmap_btree.c
@@ -598,25 +598,6 @@ xfs_bmbt_block_maxrecs(
        return blocklen / (sizeof(xfs_bmbt_key_t) + sizeof(xfs_bmbt_ptr_t));
 }
 
-/*
- * Allocate a new bmap btree cursor for reloading an inode block mapping data
- * structure.  Note that callers can use the staged cursor to reload extents
- * format inode forks if they rebuild the iext tree and commit the staged
- * cursor immediately.
- */
-struct xfs_btree_cur *
-xfs_bmbt_stage_cursor(
-       struct xfs_mount        *mp,
-       struct xfs_inode        *ip,
-       struct xbtree_ifakeroot *ifake)
-{
-       struct xfs_btree_cur    *cur;
-
-       cur = xfs_bmbt_init_cursor(mp, NULL, ip, XFS_STAGING_FORK);
-       xfs_btree_stage_ifakeroot(cur, ifake);
-       return cur;
-}
-
 /*
  * Swap in the new inode fork root.  Once we pass this point the newly rebuilt
  * mappings are in place and we have to kill off any old btree blocks.

diff --git a/fs/xfs/libxfs/xfs_bmap_btree.h b/fs/xfs/libxfs/xfs_bmap_btree.h
index e93aa42e2bf5b8921ff1d0b8f7e4fca4ccea4ac9..de1b73f1225ca7df1d821f78eab3b29f57167453 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap_btree.h
+++ b/fs/xfs/libxfs/xfs_bmap_btree.h
@@ -107,8 +107,6 @@ extern int xfs_bmbt_change_owner(struct xfs_trans *tp, struct xfs_inode *ip,
 
 extern struct xfs_btree_cur *xfs_bmbt_init_cursor(struct xfs_mount *,
                struct xfs_trans *, struct xfs_inode *, int);
-struct xfs_btree_cur *xfs_bmbt_stage_cursor(struct xfs_mount *mp,
-               struct xfs_inode *ip, struct xbtree_ifakeroot *ifake);
 void xfs_bmbt_commit_staged_btree(struct xfs_btree_cur *cur,
                struct xfs_trans *tp, int whichfork);
 

diff --git a/fs/xfs/scrub/bmap_repair.c b/fs/xfs/scrub/bmap_repair.c
index a4bb89fdd51066eeded6cabd4a81492ea5325047..1e656fab5e41a03bcd63a8a04c9ed897ea5d40fb 100644 (file)
--- a/fs/xfs/scrub/bmap_repair.c
+++ b/fs/xfs/scrub/bmap_repair.c
@@ -639,7 +639,13 @@ xrep_bmap_build_new_fork(
        rb->new_bmapbt.bload.get_records = xrep_bmap_get_records;
        rb->new_bmapbt.bload.claim_block = xrep_bmap_claim_block;
        rb->new_bmapbt.bload.iroot_size = xrep_bmap_iroot_size;
-       bmap_cur = xfs_bmbt_stage_cursor(sc->mp, sc->ip, ifake);
+
+       /*
+        * Allocate a new bmap btree cursor for reloading an inode block mapping
+        * data structure.
+        */
+       bmap_cur = xfs_bmbt_init_cursor(sc->mp, NULL, sc->ip, XFS_STAGING_FORK);
+       xfs_btree_stage_ifakeroot(bmap_cur, ifake);
 
        /*
         * Figure out the size and format of the new fork, then fill it with