Re: [PATCH 6/9] repair: report AG btree verifier errors

[Brian Foster <bfoster@redhat.com>]

On Tue, Apr 15, 2014 at 06:24:58PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
> 
> 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>
> ---
>  repair/scan.c | 27 ++++++++++++++++++++++++---
>  1 file changed, 24 insertions(+), 3 deletions(-)
> 
> diff --git a/repair/scan.c b/repair/scan.c
> index 6c43474..75b4b70 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,14 +139,25 @@ 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,
>  			magic);
>  
> -	ASSERT(dirty == 0 || (dirty && !no_modify));
> -

Here we remove the dirty assert, but don't change the semantics of dirty
(we use badcrc).

Brian

> -	if (dirty && !no_modify)
> +	if ((dirty || badcrc) && !no_modify)
>  		libxfs_writebuf(bp, 0);
>  	else
>  		libxfs_putbuf(bp);
> @@ -1066,6 +1084,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);
>  
> -- 
> 1.9.0
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs