xfs: remove xfs_inobt_cur

Source kernel commit: 3038fd8129384c64946c17198229ee61f6f2c8e1

This helper provides no real advantage over just open code the two
calls in it 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_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c
index 08076ef12bbfad9a214ad7aa153178fca9e62d49..cf59530ea2d6d2c66d7641678d928f36949312a0 100644 (file)
--- a/libxfs/xfs_ialloc_btree.c
+++ b/libxfs/xfs_ialloc_btree.c
@@ -709,30 +709,6 @@ xfs_inobt_max_size(
                                        XFS_INODES_PER_CHUNK);
 }
 
-/* Read AGI and create inobt cursor. */
-int
-xfs_inobt_cur(
-       struct xfs_perag        *pag,
-       struct xfs_trans        *tp,
-       xfs_btnum_t             which,
-       struct xfs_btree_cur    **curpp,
-       struct xfs_buf          **agi_bpp)
-{
-       struct xfs_btree_cur    *cur;
-       int                     error;
-
-       ASSERT(*agi_bpp == NULL);
-       ASSERT(*curpp == NULL);
-
-       error = xfs_ialloc_read_agi(pag, tp, agi_bpp);
-       if (error)
-               return error;
-
-       cur = xfs_inobt_init_cursor(pag, tp, *agi_bpp, which);
-       *curpp = cur;
-       return 0;
-}
-
 static int
 xfs_inobt_count_blocks(
        struct xfs_perag        *pag,
@@ -741,13 +717,14 @@ xfs_inobt_count_blocks(
        xfs_extlen_t            *tree_blocks)
 {
        struct xfs_buf          *agbp = NULL;
-       struct xfs_btree_cur    *cur = NULL;
+       struct xfs_btree_cur    *cur;
        int                     error;
 
-       error = xfs_inobt_cur(pag, tp, btnum, &cur, &agbp);
+       error = xfs_ialloc_read_agi(pag, tp, &agbp);
        if (error)
                return error;
 
+       cur = xfs_inobt_init_cursor(pag, tp, agbp, btnum);
        error = xfs_btree_count_blocks(cur, tree_blocks);
        xfs_btree_del_cursor(cur, error);
        xfs_trans_brelse(tp, agbp);

diff --git a/libxfs/xfs_ialloc_btree.h b/libxfs/xfs_ialloc_btree.h
index 40f0fc0e8da37790eee192cbf03d78314362b942..2f1552d656559434d5d38bbd84659b9b1258334a 100644 (file)
--- a/libxfs/xfs_ialloc_btree.h
+++ b/libxfs/xfs_ialloc_btree.h
@@ -64,9 +64,6 @@ int xfs_finobt_calc_reserves(struct xfs_perag *perag, struct xfs_trans *tp,
                xfs_extlen_t *ask, xfs_extlen_t *used);
 extern xfs_extlen_t xfs_iallocbt_calc_size(struct xfs_mount *mp,
                unsigned long long len);
-int xfs_inobt_cur(struct xfs_perag *pag, struct xfs_trans *tp,
-               xfs_btnum_t btnum, struct xfs_btree_cur **curpp,
-               struct xfs_buf **agi_bpp);
 
 void xfs_inobt_commit_staged_btree(struct xfs_btree_cur *cur,
                struct xfs_trans *tp, struct xfs_buf *agbp);