diff options
| author | Dave Chinner <dchinner@redhat.com> | 2021-06-02 10:48:24 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2021-06-02 10:48:24 +1000 |
| commit | 7b13c515518264df0cb90d84fdab907a627c0fa9 (patch) | |
| tree | 5d73b0faa2980e021801a92f0a303857fc5c7a4f /fs/xfs/scrub | |
| parent | 289d38d22cd88960cb648dc480c50de5102519bb (diff) | |
xfs: use perag for ialloc btree cursors
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Diffstat (limited to 'fs/xfs/scrub')
| -rw-r--r-- | fs/xfs/scrub/agheader_repair.c | 4 | ||||
| -rw-r--r-- | fs/xfs/scrub/common.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/fs/xfs/scrub/agheader_repair.c b/fs/xfs/scrub/agheader_repair.c index ee2d85e3fd4a..ecc9146647ba 100644 --- a/fs/xfs/scrub/agheader_repair.c +++ b/fs/xfs/scrub/agheader_repair.c @@ -806,7 +806,7 @@ xrep_agi_calc_from_btrees( xfs_agino_t freecount; int error; - cur = xfs_inobt_init_cursor(mp, sc->tp, agi_bp, sc->sa.agno, + cur = xfs_inobt_init_cursor(mp, sc->tp, agi_bp, sc->sa.pag, XFS_BTNUM_INO); error = xfs_ialloc_count_inodes(cur, &count, &freecount); if (error) @@ -828,7 +828,7 @@ xrep_agi_calc_from_btrees( xfs_sb_version_hasinobtcounts(&mp->m_sb)) { xfs_agblock_t blocks; - cur = xfs_inobt_init_cursor(mp, sc->tp, agi_bp, sc->sa.agno, + cur = xfs_inobt_init_cursor(mp, sc->tp, agi_bp, sc->sa.pag, XFS_BTNUM_FINO); error = xfs_btree_count_blocks(cur, &blocks); if (error) diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c index 3035f8cee6f6..64c3b9b78d0d 100644 --- a/fs/xfs/scrub/common.c +++ b/fs/xfs/scrub/common.c @@ -458,7 +458,6 @@ xchk_ag_btcur_init( struct xchk_ag *sa) { struct xfs_mount *mp = sc->mp; - xfs_agnumber_t agno = sa->agno; xchk_perag_get(sc->mp, sa); if (sa->agf_bp && @@ -479,14 +478,14 @@ xchk_ag_btcur_init( if (sa->agi_bp && xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_INO)) { sa->ino_cur = xfs_inobt_init_cursor(mp, sc->tp, sa->agi_bp, - agno, sa->pag, XFS_BTNUM_INO); + sa->pag, XFS_BTNUM_INO); } /* Set up a finobt cursor for cross-referencing. */ if (sa->agi_bp && xfs_sb_version_hasfinobt(&mp->m_sb) && xchk_ag_btree_healthy_enough(sc, sa->pag, XFS_BTNUM_FINO)) { sa->fino_cur = xfs_inobt_init_cursor(mp, sc->tp, sa->agi_bp, - agno, sa->pag, XFS_BTNUM_FINO); + sa->pag, XFS_BTNUM_FINO); } /* Set up a rmapbt cursor for cross-referencing. */ |