xfs: remove the btnum argument to xfs_inobt_count_blocks

Source kernel commit: 4bfb028a4c00d0a079a625d7867325efb3c37de2

xfs_inobt_count_blocks is only used for the finobt.  Hardcode the btnum
argument and rename the function to match that.

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 cf59530ea2d6d2c66d7641678d928f36949312a0..609f62c65cea7150ec834e418fd8fafb00365e57 100644 (file)
--- a/libxfs/xfs_ialloc_btree.c
+++ b/libxfs/xfs_ialloc_btree.c
@@ -710,10 +710,9 @@ xfs_inobt_max_size(
 }
 
 static int
-xfs_inobt_count_blocks(
+xfs_finobt_count_blocks(
        struct xfs_perag        *pag,
        struct xfs_trans        *tp,
-       xfs_btnum_t             btnum,
        xfs_extlen_t            *tree_blocks)
 {
        struct xfs_buf          *agbp = NULL;
@@ -724,7 +723,7 @@ xfs_inobt_count_blocks(
        if (error)
                return error;
 
-       cur = xfs_inobt_init_cursor(pag, tp, agbp, btnum);
+       cur = xfs_inobt_init_cursor(pag, tp, agbp, XFS_BTNUM_FINO);
        error = xfs_btree_count_blocks(cur, tree_blocks);
        xfs_btree_del_cursor(cur, error);
        xfs_trans_brelse(tp, agbp);
@@ -772,8 +771,7 @@ xfs_finobt_calc_reserves(
        if (xfs_has_inobtcounts(pag->pag_mount))
                error = xfs_finobt_read_blocks(pag, tp, &tree_len);
        else
-               error = xfs_inobt_count_blocks(pag, tp, XFS_BTNUM_FINO,
-                               &tree_len);
+               error = xfs_finobt_count_blocks(pag, tp, &tree_len);
        if (error)
                return error;