xfs_repair: log when buffers fail CRC checks even if we just recompute it
PATCH 1/1 xfs_repair: log when buffers fail CRC checks even if we just recompute it
From: Darrick J. Wong <[email protected]>
We should always log metadata block CRC validation errors, even if we decide that the block contents are ok and that we'll simply recompute the checksum. Without this, xfs_repair -n doesn't say anything about crc errors.
Signed-off-by Darrick J. Wong <[email protected]>
--- repair/attr_repair.c | 15 ++++++++++++--- repair/da_util.c | 12 ++++++++---- repair/dir2.c | 28 +++++++++++++++++++++------- 3 files changed, 41 insertions(+), 14 deletions(-)
repair/attr_repair.c +12 -3
@@ -971,8 +971,13 @@ process_leaf_attr_level(xfs_mount_t *mp,* If block looks ok but CRC didn't match, make sure to * recompute it. */ -if (!no_modify && bp->b_error == -EFSBADCRC ) - repair++; +if (bp->b_error == -EFSBADCRC ) { +do_warn ( +_ ("bad checksum for block %u in attribute fork for inode %" PRIu64"\n" ), + da_bno, ino); +if (!no_modify) + repair++; + }if (repair && !no_modify) {libxfs_buf_mark_dirty (bp);
@@ -1252,8 +1257,12 @@ process_longform_attr(return 1 ; } -if (bp->b_error == -EFSBADCRC ) +if (bp->b_error == -EFSBADCRC ) { +do_warn ( +_ ("bad checksum for block 0 in attribute fork for inode %" PRIu64"\n" ), + ino); (*repair)++; + }/* is this block sane? */ if (__check_attr_header (mp, bp, ino)) {
repair/da_util.c +8 -4
@@ -562,7 +562,7 @@ _("can't read %s block %u for inode %" PRIu64 "\n"), FORKNAME(whichfork), dabno, cursor->ino);return 1 ; } -if (bp->b_error == -EFSCORRUPTED || bp->b_error == -EFSBADCRC ) { +if (bp->b_error == -EFSCORRUPTED ) {do_warn (_ ("corrupt %s tree block %u for inode %" PRIu64"\n" ),FORKNAME (whichfork), dabno, cursor->ino);
@@ -625,9 +625,13 @@ _("bad level %d in %s block %u for inode %" PRIu64 "\n"),* If block looks ok but CRC didn't match, make sure to * recompute it. */ -if (!no_modify && - cursor->level[this_level].bp->b_error == -EFSBADCRC ) - cursor->level[this_level].dirty =1 ; +if (cursor->level[this_level].bp->b_error == -EFSBADCRC ) { +do_warn ( +_ ("bad checksum in %s tree block %u for inode %" PRIu64"\n" ), +FORKNAME (whichfork), dabno, cursor->ino); +if (!no_modify) + cursor->level[this_level].dirty =1 ; + }if (cursor->level[this_level].dirty && !no_modify) {libxfs_buf_mark_dirty (cursor->level[this_level].bp);
repair/dir2.c +21 -7
@@ -1103,8 +1103,13 @@ _("bad directory block magic # %#x in block %u for directory inode %" PRIu64 "\n rval =process_dir2_data (mp, ino, dip, ino_discovery, dirname, parent, bp, dot, dotdot, mp->m_dir_geo->datablk, (char *)blp, &dirty);/* If block looks ok but CRC didn't match, make sure to recompute it. */ -if (!rval && bp->b_error == -EFSBADCRC ) - dirty =1 ; +if (bp->b_error == -EFSBADCRC ) { +do_warn ( +_ ("corrupt directory block %u for inode %" PRIu64"\n" ), + mp->m_dir_geo->datablk, ino); +if (!rval) + dirty =1 ; + }if (dirty && !no_modify) { *repair =1 ;libxfs_buf_mark_dirty (bp);
@@ -1280,8 +1285,14 @@ _("bad sibling back pointer for block %u in directory inode %" PRIu64 "\n"),* If block looks ok but CRC didn't match, make sure to * recompute it. */ -if (!no_modify && bp->b_error == -EFSBADCRC ) - buf_dirty =1 ; +if (bp->b_error == -EFSBADCRC ) { +do_warn ( +_ ("bad checksum for directory leafn block %u for inode %" PRIu64"\n" ), + da_bno, ino); +if (!no_modify) + buf_dirty =1 ; + } +ASSERT (buf_dirty ==0 || (buf_dirty && !no_modify));if (buf_dirty && !no_modify) { *repair =1 ;
@@ -1444,10 +1455,13 @@ _("bad directory block magic # %#x in block %" PRIu64 " for directory inode %" P i =process_dir2_data (mp, ino, dip, ino_discovery, dirname, parent, bp, dot, dotdot, (xfs_dablk_t )dbno, (char *)data + mp->m_dir_geo->blksize, &dirty); -if (i ==0 ) { +if (i ==0 ) good++; -/* Maybe just CRC is wrong. Make sure we correct it. */ -if (bp->b_error == -EFSBADCRC ) +if (bp->b_error == -EFSBADCRC ) { +do_warn ( +_ ("bad checksum in directory data block %" PRIu64" for inode %" PRIu64"\n" ), + dbno, ino); +if (i ==0 ) dirty =1 ; }if (dirty && !no_modify) {
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>