From: Darrick J. Wong Date: Wed, 2 Sep 2015 22:43:07 +0000 (+1000) Subject: xfs_repair: force not-so-bad bmbt blocks back through the verifier X-Git-Tag: v4.2.0~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43ba186145658fe8337e237bb5b5e72c240c49d5;p=thirdparty%2Fxfsprogs-dev.git xfs_repair: force not-so-bad bmbt blocks back through the verifier If during prefetch we encounter a bmbt block that fails the CRC check due to corruption in the unused part of the block, force the buffer back through the non-prefetch verifiers later so that the CRC is updated. Otherwise, the bad checksum goes unfixed and the kernel will still flag the bmbt block as invalid. Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- diff --git a/repair/prefetch.c b/repair/prefetch.c index 1de3ec0a5..32ec55ebd 100644 --- a/repair/prefetch.c +++ b/repair/prefetch.c @@ -276,6 +276,18 @@ pf_scan_lbtree( XFS_BUF_SET_PRIORITY(bp, isadir ? B_DIR_BMAP : B_BMAP); + /* + * If the verifier flagged a problem with the buffer, we can't trust + * its contents for the purposes of reading ahead. Stop prefetching + * the tree and mark the buffer unchecked so that the next read of the + * buffer will retain the error status and be acted upon appropriately. + */ + if (bp->b_error) { + bp->b_flags |= LIBXFS_B_UNCHECKED; + libxfs_putbuf(bp); + return 0; + } + rc = (*func)(XFS_BUF_TO_BLOCK(bp), level - 1, isadir, args); libxfs_putbuf(bp);