xfs: remove xfs_inobt_cur

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>

diff --git a/fs/xfs/libxfs/xfs_ialloc_btree.c b/fs/xfs/libxfs/xfs_ialloc_btree.c
index 1fe9d83c575ea858d488efdb31fd860b1685efae..441c5a7be1e0fd34a2a3672b238bf695079c247c 100644 (file)
--- a/fs/xfs/libxfs/xfs_ialloc_btree.c
+++ b/fs/xfs/libxfs/xfs_ialloc_btree.c
@@ -710,30 +710,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,
@@ -742,13 +718,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/fs/xfs/libxfs/xfs_ialloc_btree.h b/fs/xfs/libxfs/xfs_ialloc_btree.h
index 40f0fc0e8da37790eee192cbf03d78314362b942..2f1552d656559434d5d38bbd84659b9b1258334a 100644 (file)
--- a/fs/xfs/libxfs/xfs_ialloc_btree.h
+++ b/fs/xfs/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);

diff --git a/fs/xfs/xfs_iwalk.c b/fs/xfs/xfs_iwalk.c
index dc3d83d7dee1ddc6f17df4b0e4c982444e80cc85..38092c049c0822e899c6faaf4662dd3e93d8b086 100644 (file)
--- a/fs/xfs/xfs_iwalk.c
+++ b/fs/xfs/xfs_iwalk.c
@@ -266,9 +266,10 @@ xfs_iwalk_ag_start(
 
        /* Set up a fresh cursor and empty the inobt cache. */
        iwag->nr_recs = 0;
-       error = xfs_inobt_cur(pag, tp, XFS_BTNUM_INO, curpp, agi_bpp);
+       error = xfs_ialloc_read_agi(pag, tp, agi_bpp);
        if (error)
                return error;
+       *curpp = xfs_inobt_init_cursor(pag, tp, *agi_bpp, XFS_BTNUM_INO);
 
        /* Starting at the beginning of the AG?  That's easy! */
        if (agino == 0)
@@ -383,11 +384,11 @@ xfs_iwalk_run_callbacks(
        }
 
        /* ...and recreate the cursor just past where we left off. */
-       error = xfs_inobt_cur(iwag->pag, iwag->tp, XFS_BTNUM_INO, curpp,
-                       agi_bpp);
+       error = xfs_ialloc_read_agi(iwag->pag, iwag->tp, agi_bpp);
        if (error)
                return error;
-
+       *curpp = xfs_inobt_init_cursor(iwag->pag, iwag->tp, *agi_bpp,
+                       XFS_BTNUM_INO);
        return xfs_inobt_lookup(*curpp, next_agino, XFS_LOOKUP_GE, has_more);
 }