diff options
| author | Dave Chinner <dchinner@redhat.com> | 2014-05-02 09:31:17 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-05-02 09:31:17 +1000 |
| commit | a76a5a718dd239fd4b1bc24332e2625527a88915 (patch) | |
| tree | 72764b6a32757709d20a1487ace12d7ce6125ac7 | |
| parent | 8f657d7ec7888c84a7180f4be93007f54865e65e (diff) | |
| download | xfsprogs-dev-a76a5a718dd239fd4b1bc24332e2625527a88915.tar.gz | |
repair: report AG btree verifier errors
When we scan the filesystem freespace and inode maps in phase 2, we
don't report CRC errors that are found. We don't really care from a
repair perspective, because the trees are completely rebuilt from
the ground up in phase 5, but froma checking perspective we need to
inform the user that we found inconsistencies.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
| -rw-r--r-- | repair/scan.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/repair/scan.c b/repair/scan.c index dec84ed241..4b0ea04db8 100644 --- a/repair/scan.c +++ b/repair/scan.c @@ -82,6 +82,12 @@ scan_sbtree( do_error(_("can't read btree block %d/%d\n"), agno, root); return; } + if (bp->b_error == EFSBADCRC || bp->b_error == EFSCORRUPTED) { + do_warn(_("btree block %d/%d is suspect, error %d\n"), + agno, root, bp->b_error); + suspect = 1; + } + (*func)(XFS_BUF_TO_BLOCK(bp), nlevels - 1, root, agno, suspect, isroot, magic, priv); libxfs_putbuf(bp); @@ -123,6 +129,7 @@ scan_lbtree( xfs_buf_t *bp; int err; int dirty = 0; + bool badcrc = false; bp = libxfs_readbuf(mp->m_dev, XFS_FSB_TO_DADDR(mp, root), XFS_FSB_TO_BB(mp, 1), 0, ops); @@ -132,6 +139,19 @@ scan_lbtree( XFS_FSB_TO_AGBNO(mp, root)); return(1); } + + /* + * only check for bad CRC here - caller will determine if there + * is a corruption or not and whether it got corrected and so needs + * writing back. CRC errors always imply we need to write the block. + */ + if (bp->b_error == EFSBADCRC) { + do_warn(_("btree block %d/%d is suspect, error %d\n"), + XFS_FSB_TO_AGNO(mp, root), + XFS_FSB_TO_AGBNO(mp, root), bp->b_error); + badcrc = true; + } + err = (*func)(XFS_BUF_TO_BLOCK(bp), nlevels - 1, type, whichfork, root, ino, tot, nex, blkmapp, bm_cursor, isroot, check_dups, &dirty, @@ -139,7 +159,7 @@ scan_lbtree( ASSERT(dirty == 0 || (dirty && !no_modify)); - if (dirty && !no_modify) + if ((dirty || badcrc) && !no_modify) libxfs_writebuf(bp, 0); else libxfs_putbuf(bp); @@ -1066,6 +1086,9 @@ scan_freelist( do_abort(_("can't read agfl block for ag %d\n"), agno); return; } + if (agflbuf->b_error == EFSBADCRC) + do_warn(_("agfl has bad CRC for ag %d\n"), agno); + freelist = XFS_BUF_TO_AGFL_BNO(mp, agflbuf); i = be32_to_cpu(agf->agf_flfirst); |