xfs: fix merge errors in fuzzer tests

Fix some merge errors when the fuzzer tests went in.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/tests/xfs/085.out b/tests/xfs/085.out
index 63030810a8025bf0dddde6dc32460a2ad3c8d474..ff3dccd81944ae1d39a4064daf286770e17a2064 100644 (file)
--- a/tests/xfs/085.out
+++ b/tests/xfs/085.out
@@ -5,8 +5,6 @@ QA output created by 085
 + check fs
 + corrupt image
 + mount image
-+ modify files
-broken: 1
 + repair fs
 + mount image (2)
 + chattr -R -i

diff --git a/tests/xfs/098.out b/tests/xfs/098.out
index 84a2b4d045fcd5d0b880b3b56e1b0bb36b8a8e69..ef0554dbe013d311cdcb1c5162e1847e86be7183 100644 (file)
--- a/tests/xfs/098.out
+++ b/tests/xfs/098.out
@@ -5,7 +5,6 @@ QA output created by 098
 + check fs
 + corrupt image
 + mount image
-broken: 1
 + repair fs
 + mount image (2)
 + chattr -R -i

diff --git a/tests/xfs/099.out b/tests/xfs/099.out
index 44268594a3798c4dfa18fb24bc955b797a0816f8..773200b9170e8cf7befc6191024325af2301cdaa 100644 (file)
--- a/tests/xfs/099.out
+++ b/tests/xfs/099.out
@@ -1,4 +1,4 @@
-QA output created by 016
+QA output created by 099
 + create scratch fs
 + mount fs image
 + make some files

diff --git a/tests/xfs/100.out b/tests/xfs/100.out
index 98d8dbc2e045beaa0d062ce528f91c05ee8e86ad..97dba7cba3763a641e76a2df6d6ce32a86c49472 100644 (file)
--- a/tests/xfs/100.out
+++ b/tests/xfs/100.out
@@ -1,4 +1,4 @@
-QA output created by 017
+QA output created by 100
 + create scratch fs
 + mount fs image
 + make some files

diff --git a/tests/xfs/101.out b/tests/xfs/101.out
index 49430f7db6b9c4e7282b515f103a33c150b1101d..22ca6202bdc1e4d7f3dfe26cbbeae0ce8193bc50 100644 (file)
--- a/tests/xfs/101.out
+++ b/tests/xfs/101.out
@@ -1,4 +1,4 @@
-QA output created by 018
+QA output created by 101
 + create scratch fs
 + mount fs image
 + make some files

diff --git a/tests/xfs/102.out b/tests/xfs/102.out
index 58f493ce9b5e4eb6ba95f261c204319815ad2532..d8a8fa14476183739b5d2a80325e721aa187e5bb 100644 (file)
--- a/tests/xfs/102.out
+++ b/tests/xfs/102.out
@@ -1,4 +1,4 @@
-QA output created by 019
+QA output created by 102
 + create scratch fs
 + mount fs image
 + make some files