use _filter_repair when running xfs_repair. This stops timestamp mismatches from...

Merge of master-melb:xfs-cmds:27793a by kenmcd.

  pipe repair output through _filter_repair

diff --git a/031 b/031
index 2afeac7fe0941c2e23266e8ca76fb3a19ff24cdb..779cf27c00227f81fb516104a6cbf34b0c1938be 100755 (executable)
--- a/031
+++ b/031
@@ -21,6 +21,7 @@ rm -f $seq.full
 
 # get standard environment, filters and checks
 . ./common.rc
+. ./common.repair
 . ./common.filter
 
 # link correct .out file
@@ -28,14 +29,15 @@ _link_out_file $seq.out
 
 _check_repair()
 {
-       _scratch_xfs_repair >$tmp.0 2>&1
+       echo "Repairing, round 0" >> $seq.full
+       _scratch_xfs_repair 2>&1 | _filter_repair | tee -a $seq.full >$tmp.0
        for i in 1 2 3 4
        do
                echo "Repairing, iteration $i" | tee -a $seq.full
-               _scratch_xfs_repair 2>&1 | tee -a $seq.full >$tmp.$i
+               _scratch_xfs_repair 2>&1 | _filter_repair >$tmp.$i
                diff $tmp.0 $tmp.$i >> $seq.full
                if [ $? -ne 0 ]; then
-                       echo "ERROR: repair round $i differs (see $seq.full)"
+                       echo "ERROR: repair round $i differs to round 0 (see $seq.full)" | tee -a $seq.full
                        break
                fi
                # echo all interesting stuff...