Re: [PATCH 2/2] filter: update xfs_repair filter for new sunit/swidth warning

[Eric Sandeen <sandeen@sandeen.net>]

On 8/25/14, 5:34 PM, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
> 
> New xfs_repair programs have a different sunit/swidth warning that
> is triggering failures such as:
> 
>     -Note - stripe unit (0) and width (0) fields have been reset.
>     -Please set with mount -o sunit=<value>,swidth=<value>
>     +Note - stripe unit (0) and width (0) were copied from a backup superblock.
>     +Please reset with mount -o sunit=<value>,swidth=<value> if necessary
> 
> Update the filter to catch both cases and output the old message so
> tests pass again.
> 
> Signed-off-by: Dave Chinner <dchinner@redhat.com>

Ah, crap, I forgot to do this, I'm sorry.  Thanks.

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

> ---
>  common/repair | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/common/repair b/common/repair
> index 46ca9e0..a157580 100644
> --- a/common/repair
> +++ b/common/repair
> @@ -85,6 +85,9 @@ s/\s+- \d+:\d\d:\d\d:.*\n//g;
>  /^agfl has bad CRC/ && next;
>  # finobt enabled filesystem output
>  s/(inode chunk) (\d+)\/(\d+)/AGNO\/INO/;
> +# sunit/swidth reset messages
> +s/^(Note - .*) were copied.*/\1 fields have been reset./;
> +s/^(Please) reset (with .*) if necessary/\1 set \2/;
>  	print;'
>  }
>  
>