xfs: don't check agf_btreeblks on pre-lazysbcount filesystems
PATCH 1/1 xfs: don't check agf_btreeblks on pre-lazysbcount filesystems
From: Darrick J. Wong <[email protected]>
The AGF free space btree block counter wasn't added until the lazysbcount feature was added to XFS midway through the life of the V4 format, so ignore the field when checking. Online AGF repair requires rmapbt, so it doesn't need the feature check.
Signed-off-by Darrick J. Wong <[email protected]>
--- fs/xfs/scrub/agheader.c | 7 ++++++- fs/xfs/scrub/fscounters.c | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-)
fs/xfs/scrub/agheader.c +6 -1
@@ -416,6 +416,10 @@ xchk_agf_xref_btreeblks(xfs_agblock_t btreeblks;int error; +/* agf_btreeblks didn't exist before lazysbcount */ +if (!xfs_sb_version_haslazysbcount (&sc->mp->m_sb)) +return ; +/* Check agf_rmap_blocks; set up for agf_btreeblks check */ if (sc->sa.rmap_cur) { error =xfs_btree_count_blocks (sc->sa.rmap_cur, &blocks);
@@ -581,7 +585,8 @@ xchk_agf(xchk_block_set_corrupt (sc, sc->sa.agf_bp);if (pag->pagf_flcount !=be32_to_cpu (agf->agf_flcount))xchk_block_set_corrupt (sc, sc->sa.agf_bp); -if (pag->pagf_btreeblks !=be32_to_cpu (agf->agf_btreeblks)) +if (xfs_sb_version_haslazysbcount (&sc->mp->m_sb) && + pag->pagf_btreeblks !=be32_to_cpu (agf->agf_btreeblks))xchk_block_set_corrupt (sc, sc->sa.agf_bp);xfs_perag_put (pag);
fs/xfs/scrub/fscounters.c +2 -1
@@ -182,7 +182,8 @@ xchk_fscount_aggregate_agcounts(/* Add up the free/freelist/bnobt/cntbt blocks */ fsc->fdblocks += pag->pagf_freeblks; fsc->fdblocks += pag->pagf_flcount; - fsc->fdblocks += pag->pagf_btreeblks; +if (xfs_sb_version_haslazysbcount (&sc->mp->m_sb)) + fsc->fdblocks += pag->pagf_btreeblks;/* * Per-AG reservations are taken out of the incore counters,
Quoted 8 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
The AGF free space btree block counter wasn't added until the lazysbcount feature was added to XFS midway through the life of the V4 format, so ignore the field when checking. Online AGF repair requires rmapbt, so it doesn't need the feature check.
Signed-off-by Darrick J. Wong <[email protected]>
Looks good.
Reviewed-by Dave Chinner <[email protected]>
Signature · 2 lines
Dave Chinner [email protected]