[PATCH] xfs_repair: don't abort on bad directory leaf crc during leaf check

[Brian Foster]

On Wed, Mar 18, 2015 at 04:22:39PM -0700, Darrick J. Wong wrote:
> longform_dir2_check_leaf() checks a directory leaf block to help
> decide if we need to rebuild the directory.  If the verifier fails
> with a CRC or corrupt structure error, rebuild the directory instead
> of aborting.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong at oracle.com>
> ---
>  repair/phase6.c |    7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/repair/phase6.c b/repair/phase6.c
> index 1728609..c09b394 100644
> --- a/repair/phase6.c
> +++ b/repair/phase6.c
> @@ -1951,7 +1951,12 @@ longform_dir2_check_leaf(
>  	da_bno = mp->m_dirleafblk;
>  	error = dir_read_buf(ip, da_bno, -1, &bp, &xfs_dir3_leaf1_buf_ops,
>  			     &fixit);
> -	if (error) {
> +	if (error == EFSBADCRC || error == EFSCORRUPTED || fixit) {
> +		do_warn(
> +	_("leaf block %u for directory inode %" PRIu64 " bad CRC\n"),
> +			da_bno, ip->i_ino);
> +		return 1;
> +	} else if (error) {

I don't think we'll ever see EFSBADCRC from this codepath (that appears
to be the purpose of 'fixit'). Looking at it further, it's self
documenting and robust against changes in the read codepath, so seems
pretty good to me:

Reviewed-by: Brian Foster <bfoster at redhat.com>

>  		do_error(
>  	_("can't read block %u for directory inode %" PRIu64 ", error %d\n"),
>  			da_bno, ip->i_ino, error);
> 
> _______________________________________________
> xfs mailing list
> xfs at oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs