From: Dave Chinner <dchinner@redhat.com>
Date: Mon, 8 Sep 2014 10:48:59 +0000 (+1000)
Subject: filter: update xfs_repair filter for new sunit/swidth warning
X-Git-Tag: v2022.05.01~3085
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f007c2b465e331317e91b5125e8da04826e57c82;p=users%2Fhch%2Fxfstests-dev.git

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=<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>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/common/repair b/common/repair
index 46ca9e0c9..a1575808b 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;'
 }