xfs: cross-reference bnobt records with cntbt
Scrub should make sure that each bnobt record has a corresponding cntbt record. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Dave Chinner <dchinner@redhat.com>
This commit is contained in:
parent
52dc4b44af
commit
e1134b12fd
|
@ -454,6 +454,38 @@ xfs_scrub_agf_xref_freeblks(
|
|||
xfs_scrub_block_xref_set_corrupt(sc, sc->sa.agf_bp);
|
||||
}
|
||||
|
||||
/* Cross reference the AGF with the cntbt (freespace by length btree) */
|
||||
static inline void
|
||||
xfs_scrub_agf_xref_cntbt(
|
||||
struct xfs_scrub_context *sc)
|
||||
{
|
||||
struct xfs_agf *agf = XFS_BUF_TO_AGF(sc->sa.agf_bp);
|
||||
xfs_agblock_t agbno;
|
||||
xfs_extlen_t blocks;
|
||||
int have;
|
||||
int error;
|
||||
|
||||
if (!sc->sa.cnt_cur)
|
||||
return;
|
||||
|
||||
/* Any freespace at all? */
|
||||
error = xfs_alloc_lookup_le(sc->sa.cnt_cur, 0, -1U, &have);
|
||||
if (!xfs_scrub_should_check_xref(sc, &error, &sc->sa.cnt_cur))
|
||||
return;
|
||||
if (!have) {
|
||||
if (agf->agf_freeblks != be32_to_cpu(0))
|
||||
xfs_scrub_block_xref_set_corrupt(sc, sc->sa.agf_bp);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Check agf_longest */
|
||||
error = xfs_alloc_get_rec(sc->sa.cnt_cur, &agbno, &blocks, &have);
|
||||
if (!xfs_scrub_should_check_xref(sc, &error, &sc->sa.cnt_cur))
|
||||
return;
|
||||
if (!have || blocks != be32_to_cpu(agf->agf_longest))
|
||||
xfs_scrub_block_xref_set_corrupt(sc, sc->sa.agf_bp);
|
||||
}
|
||||
|
||||
/* Cross-reference with the other btrees. */
|
||||
STATIC void
|
||||
xfs_scrub_agf_xref(
|
||||
|
@ -474,6 +506,7 @@ xfs_scrub_agf_xref(
|
|||
|
||||
xfs_scrub_xref_is_used_space(sc, agbno, 1);
|
||||
xfs_scrub_agf_xref_freeblks(sc);
|
||||
xfs_scrub_agf_xref_cntbt(sc);
|
||||
|
||||
/* scrub teardown will take care of sc->sa for us */
|
||||
}
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include "xfs_sb.h"
|
||||
#include "xfs_alloc.h"
|
||||
#include "xfs_rmap.h"
|
||||
#include "xfs_alloc.h"
|
||||
#include "scrub/xfs_scrub.h"
|
||||
#include "scrub/scrub.h"
|
||||
#include "scrub/common.h"
|
||||
|
@ -49,6 +50,48 @@ xfs_scrub_setup_ag_allocbt(
|
|||
}
|
||||
|
||||
/* Free space btree scrubber. */
|
||||
/*
|
||||
* Ensure there's a corresponding cntbt/bnobt record matching this
|
||||
* bnobt/cntbt record, respectively.
|
||||
*/
|
||||
STATIC void
|
||||
xfs_scrub_allocbt_xref_other(
|
||||
struct xfs_scrub_context *sc,
|
||||
xfs_agblock_t agbno,
|
||||
xfs_extlen_t len)
|
||||
{
|
||||
struct xfs_btree_cur **pcur;
|
||||
xfs_agblock_t fbno;
|
||||
xfs_extlen_t flen;
|
||||
int has_otherrec;
|
||||
int error;
|
||||
|
||||
if (sc->sm->sm_type == XFS_SCRUB_TYPE_BNOBT)
|
||||
pcur = &sc->sa.cnt_cur;
|
||||
else
|
||||
pcur = &sc->sa.bno_cur;
|
||||
if (!*pcur)
|
||||
return;
|
||||
|
||||
error = xfs_alloc_lookup_le(*pcur, agbno, len, &has_otherrec);
|
||||
if (!xfs_scrub_should_check_xref(sc, &error, pcur))
|
||||
return;
|
||||
if (!has_otherrec) {
|
||||
xfs_scrub_btree_xref_set_corrupt(sc, *pcur, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
error = xfs_alloc_get_rec(*pcur, &fbno, &flen, &has_otherrec);
|
||||
if (!xfs_scrub_should_check_xref(sc, &error, pcur))
|
||||
return;
|
||||
if (!has_otherrec) {
|
||||
xfs_scrub_btree_xref_set_corrupt(sc, *pcur, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
if (fbno != agbno || flen != len)
|
||||
xfs_scrub_btree_xref_set_corrupt(sc, *pcur, 0);
|
||||
}
|
||||
|
||||
/* Cross-reference with the other btrees. */
|
||||
STATIC void
|
||||
|
@ -59,6 +102,8 @@ xfs_scrub_allocbt_xref(
|
|||
{
|
||||
if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT)
|
||||
return;
|
||||
|
||||
xfs_scrub_allocbt_xref_other(sc, agbno, len);
|
||||
}
|
||||
|
||||
/* Scrub a bnobt/cntbt record. */
|
||||
|
|
Loading…
Reference in a new issue