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>
This commit is contained in:
Darrick J. Wong
2015-10-14 14:08:51 +11:00
committed by Dave Chinner
parent 50266c22dc
commit c892a79edc
6 changed files with 4 additions and 7 deletions
-2
View File
@@ -5,8 +5,6 @@ QA output created by 085
+ check fs + check fs
+ corrupt image + corrupt image
+ mount image + mount image
+ modify files
broken: 1
+ repair fs + repair fs
+ mount image (2) + mount image (2)
+ chattr -R -i + chattr -R -i
-1
View File
@@ -5,7 +5,6 @@ QA output created by 098
+ check fs + check fs
+ corrupt image + corrupt image
+ mount image + mount image
broken: 1
+ repair fs + repair fs
+ mount image (2) + mount image (2)
+ chattr -R -i + chattr -R -i
+1 -1
View File
@@ -1,4 +1,4 @@
QA output created by 016 QA output created by 099
+ create scratch fs + create scratch fs
+ mount fs image + mount fs image
+ make some files + make some files
+1 -1
View File
@@ -1,4 +1,4 @@
QA output created by 017 QA output created by 100
+ create scratch fs + create scratch fs
+ mount fs image + mount fs image
+ make some files + make some files
+1 -1
View File
@@ -1,4 +1,4 @@
QA output created by 018 QA output created by 101
+ create scratch fs + create scratch fs
+ mount fs image + mount fs image
+ make some files + make some files
+1 -1
View File
@@ -1,4 +1,4 @@
QA output created by 019 QA output created by 102
+ create scratch fs + create scratch fs
+ mount fs image + mount fs image
+ make some files + make some files