From f007c2b465e331317e91b5125e8da04826e57c82 Mon Sep 17 00:00:00 2001 From: Dave Chinner Date: Mon, 8 Sep 2014 20:48:59 +1000 Subject: [PATCH] filter: update xfs_repair filter for new sunit/swidth warning 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=,swidth= +Note - stripe unit (0) and width (0) were copied from a backup superblock. +Please reset with mount -o sunit=,swidth= if necessary Update the filter to catch both cases and output the old message so tests pass again. Signed-off-by: Dave Chinner Reviewed-by: Eric Sandeen Signed-off-by: Dave Chinner --- common/repair | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/repair b/common/repair index 46ca9e0c..a1575808 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;' } -- 2.30.2