xfs: filter stripe width details from repair

Several golden outputs have:

> Note - stripe unit (0) and width (0) fields have been reset.

but it's entirely possible for this to be non-zero,
which then fails to match and fails the test.

Filter this repair output and fix the golden files.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/common/repair b/common/repair
index 537d943fa3da2d768ead1861732cabc166c9949e..2b1583b7e730c3fa6e7bf6bef5d776f467834a11 100644 (file)
--- a/common/repair
+++ b/common/repair
@@ -89,6 +89,8 @@ 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/;
+# And make them generic so we dont depend on geometry
+s/(stripe unit) \(.*\) (and width) \(.*\)/\1 (SU) \2 (SW)/;
 # corrupt sb messages
 s/(superblock) (\d+)/\1 AGNO/;
 s/(AG \#)(\d+)/\1AGNO/;

diff --git a/tests/xfs/030.out.linux b/tests/xfs/030.out.linux
index 722cabf43c5d6ae8160ee5ce7db8643fc79b6d71..2b556eecb3a66fce4970cdcd64e52f7b346f311c 100644 (file)
--- a/tests/xfs/030.out.linux
+++ b/tests/xfs/030.out.linux
@@ -39,7 +39,7 @@ Phase 6 - check inode connectivity...
         - traversal finished ...
         - moving disconnected inodes to lost+found ...
 Phase 7 - verify and correct link counts...
-Note - stripe unit (0) and width (0) fields have been reset.
+Note - stripe unit (SU) and width (SW) fields have been reset.
 Please set with mount -o sunit=<value>,swidth=<value>
 done
 Corrupting agf 0 - setting bits to 0
@@ -156,7 +156,7 @@ Phase 6 - check inode connectivity...
         - traversal finished ...
         - moving disconnected inodes to lost+found ...
 Phase 7 - verify and correct link counts...
-Note - stripe unit (0) and width (0) fields have been reset.
+Note - stripe unit (SU) and width (SW) fields have been reset.
 Please set with mount -o sunit=<value>,swidth=<value>
 done
 Corrupting agf 0 - setting bits to -1

diff --git a/tests/xfs/148.out b/tests/xfs/148.out
index 466a55daa8d4cb1c89018d7d7d382d9ebdda4419..c8fb55117a22395a51778613c6f2d386a48b95c1 100644 (file)
--- a/tests/xfs/148.out
+++ b/tests/xfs/148.out
@@ -43,7 +43,7 @@ Phase 6 - check inode connectivity...
         - traversals finished ... 
         - moving disconnected inodes to lost+found ... 
 Phase 7 - verify and correct link counts...
-Note - stripe unit (0) and width (0) fields have been reset.
+Note - stripe unit (SU) and width (SW) fields have been reset.
 Please set with mount -o sunit=<value>,swidth=<value>
 done
 Corrupting agf 0 - setting bits to 0
@@ -186,7 +186,7 @@ Phase 6 - check inode connectivity...
         - traversals finished ... 
         - moving disconnected inodes to lost+found ... 
 Phase 7 - verify and correct link counts...
-Note - stripe unit (0) and width (0) fields have been reset.
+Note - stripe unit (SU) and width (SW) fields have been reset.
 Please set with mount -o sunit=<value>,swidth=<value>
 done
 Corrupting agf 0 - setting bits to -1

diff --git a/tests/xfs/178.out b/tests/xfs/178.out
index 1709863f790116ae11a616d5e25cebe6e851f8cc..8e0fc8e1616d25e0548c8e3f944d626d6c81d123 100644 (file)
--- a/tests/xfs/178.out
+++ b/tests/xfs/178.out
@@ -37,7 +37,7 @@ Phase 6 - check inode connectivity...
         - traversal finished ...
         - moving disconnected inodes to lost+found ...
 Phase 7 - verify and correct link counts...
-Note - stripe unit (0) and width (0) fields have been reset.
+Note - stripe unit (SU) and width (SW) fields have been reset.
 Please set with mount -o sunit=<value>,swidth=<value>
 done
 repair passed
@@ -73,7 +73,7 @@ Phase 6 - check inode connectivity...
         - traversal finished ...
         - moving disconnected inodes to lost+found ...
 Phase 7 - verify and correct link counts...
-Note - stripe unit (0) and width (0) fields have been reset.
+Note - stripe unit (SU) and width (SW) fields have been reset.
 Please set with mount -o sunit=<value>,swidth=<value>
 done
 repair passed