fstests: don't _require_metadata_journaling before _scratch_mkfs

This is obviously wrong and makes ./check -r skip over tests on ext4
with "ext4 on $DEV not configured with metadata journaling".

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/tests/btrfs/095 b/tests/btrfs/095
index f256e8892238ee2fe2b5a1eff6e85093e622fba2..29e828c3ba4fe44b6fa7a1a02cc8940b64bdd4ed 100755 (executable)
--- a/tests/btrfs/095
+++ b/tests/btrfs/095
@@ -53,12 +53,12 @@ _supported_os Linux
 _require_scratch
 _require_dm_target flakey
 _require_cloner
-_require_metadata_journaling $SCRATCH_DEV
 _require_xfs_io_command "falloc"
 
 rm -f $seqres.full
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/btrfs/098 b/tests/btrfs/098
index ba95fd390db0eef18655c5ed82aa6ad70b617c81..c7211a66f55ae0c7a3f963dce63453bd24769fe1 100755 (executable)
--- a/tests/btrfs/098
+++ b/tests/btrfs/098
@@ -49,11 +49,11 @@ _supported_os Linux
 _require_scratch
 _require_dm_target flakey
 _require_cloner
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/btrfs/118 b/tests/btrfs/118
index 740cb92b0669a282c726540f655597fa7aba5887..e66a4bdc5f757fd0f572f9d1d71e45162756bfd0 100755 (executable)
--- a/tests/btrfs/118
+++ b/tests/btrfs/118
@@ -49,11 +49,11 @@ _supported_fs btrfs
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/btrfs/119 b/tests/btrfs/119
index cf075502d7a24e7b11cf0e531558ff83f81b3505..4414f02f687cbc2af4dec2b85e394e4370e079b3 100755 (executable)
--- a/tests/btrfs/119
+++ b/tests/btrfs/119
@@ -48,11 +48,11 @@ _supported_fs btrfs
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/btrfs/120 b/tests/btrfs/120
index 329b45c29203566a3ca4e2bcd57931caf78a2a70..72108ffc095f3e80d9dc854a02220845a9b779a8 100755 (executable)
--- a/tests/btrfs/120
+++ b/tests/btrfs/120
@@ -50,7 +50,6 @@ _supported_fs btrfs
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
@@ -64,6 +63,7 @@ populate_testdir()
 }
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/ext4/021 b/tests/ext4/021
index d5fad7ceed51f6b3c3b71bea59b7da4c42c3a6f9..8a78087352d3bd124f0f69991673cbf30107cfdd 100755 (executable)
--- a/tests/ext4/021
+++ b/tests/ext4/021
@@ -48,11 +48,11 @@ _supported_fs ext4
 _supported_os Linux
 _require_scratch
 _require_dumpe2fs
-_require_metadata_journaling $SCRATCH_DEV
 
 # 8M in bytes
 fssize=$((8 * 1024 * 1024))
 _scratch_mkfs_sized $fssize >> $seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 
 blocksize=`$DUMPE2FS_PROG -h $SCRATCH_DEV 2>/dev/null | grep "Block size" | \
        awk '{print $3}'`

diff --git a/tests/generic/034 b/tests/generic/034
index 6727b98bd35d8778ababbbf5967675a312917874..facf060c79d12a4ab934adf0a33e3ace096f423b 100755 (executable)
--- a/tests/generic/034
+++ b/tests/generic/034
@@ -52,12 +52,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >> $seqres.full 2>&1
-
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/039 b/tests/generic/039
index 7d62393ed7e5fe3ba645ebdb42f21a157671977d..271798a8c025d77495625fc228ef46ca2b0adf80 100755 (executable)
--- a/tests/generic/039
+++ b/tests/generic/039
@@ -56,12 +56,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >> $seqres.full 2>&1
-
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/040 b/tests/generic/040
index 2aeccdd37654952f73ddc3601223c2b18a01da04..c47f73db0bc4a667deb3f892439e88681c0b7de3 100755 (executable)
--- a/tests/generic/040
+++ b/tests/generic/040
@@ -61,7 +61,6 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
@@ -74,6 +73,7 @@ else
        _scratch_mkfs >> $seqres.full 2>&1
 fi
 
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/041 b/tests/generic/041
index 283c305e459c879f1ceb2759720a051d3c1673c9..def959d9d98a3eed3650754e6553c8c8448cfc03 100755 (executable)
--- a/tests/generic/041
+++ b/tests/generic/041
@@ -65,7 +65,6 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
@@ -78,6 +77,7 @@ else
        _scratch_mkfs >> $seqres.full 2>&1
 fi
 
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/056 b/tests/generic/056
index 6ca3b1ace0589cf05da2328e40c731c7a0a26a6f..71ba2ae0d37be05621c61a55dd32c0088ab3ba4f 100755 (executable)
--- a/tests/generic/056
+++ b/tests/generic/056
@@ -54,11 +54,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >> $seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/057 b/tests/generic/057
index 76f438edff75bb67408b3d6073c0daf2f1750f17..8839597b4c08e29b4a264be45ce3f1ba7af48106 100755 (executable)
--- a/tests/generic/057
+++ b/tests/generic/057
@@ -54,11 +54,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >> $seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/059 b/tests/generic/059
index c3a60448e5698c72f4621d38afce43a8301655a3..9fc660111e90f1cce4316365b79b5d8f58547b4b 100755 (executable)
--- a/tests/generic/059
+++ b/tests/generic/059
@@ -59,12 +59,12 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 _require_xfs_io_command "fpunch"
 
 rm -f $seqres.full
 
 _scratch_mkfs >> $seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/065 b/tests/generic/065
index 935f414bad107a7abc1771a280508c8cb61ae006..9294a068e1de070379800f26f118dd3a631008e4 100755 (executable)
--- a/tests/generic/065
+++ b/tests/generic/065
@@ -55,11 +55,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >> $seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/066 b/tests/generic/066
index c42b11bb23cafe1d5a4957f8020b86d38cf52645..7dea54f9b27e96ef4a650a978011a78f2d69ece7 100755 (executable)
--- a/tests/generic/066
+++ b/tests/generic/066
@@ -60,11 +60,11 @@ _supported_os Linux
 _require_scratch
 _require_dm_target flakey
 _require_attrs
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >> $seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/073 b/tests/generic/073
index 9e3794fd2e7364c30806cf2088bd5c463f29fb13..5e07d542adf5142f4ec6e853bb63e92e6e69348a 100755 (executable)
--- a/tests/generic/073
+++ b/tests/generic/073
@@ -55,11 +55,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >> $seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/090 b/tests/generic/090
index eeb1831eed09c3c99fa7d37127f7ccb56bce1feb..6b412d11586b1f88418ddcc26dbd5012e1c32af7 100755 (executable)
--- a/tests/generic/090
+++ b/tests/generic/090
@@ -53,11 +53,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >> $seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/101 b/tests/generic/101
index f4f6c3620be2ba03c33b435c09b1e11ac365a06d..a16c58b7bbe0fd8109934254cc8c9548f56ad1a5 100755 (executable)
--- a/tests/generic/101
+++ b/tests/generic/101
@@ -51,7 +51,6 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 # This test was motivated by an issue found in btrfs when the btrfs no-holes
 # feature is enabled (introduced in kernel 3.14). So enable the feature if the
@@ -65,6 +64,7 @@ fi
 rm -f $seqres.full
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/104 b/tests/generic/104
index 79171994e4f474eb7f54eae617f610f6c7ff75bf..1bb5d10c450d83514016cd085b2bd5a6efd690c5 100755 (executable)
--- a/tests/generic/104
+++ b/tests/generic/104
@@ -49,11 +49,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/106 b/tests/generic/106
index efad8c8304ccff562488a7def43a3e0b5231daf2..d7f7a694245fc92bc9cd597dd57ee7677eb452a6 100755 (executable)
--- a/tests/generic/106
+++ b/tests/generic/106
@@ -48,11 +48,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/107 b/tests/generic/107
index e0a92457f1ca73b9bfc73fd5fcc232fce74f01ec..488abfb52639e1b2d971276ffe36c6a7497957a7 100755 (executable)
--- a/tests/generic/107
+++ b/tests/generic/107
@@ -51,11 +51,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/177 b/tests/generic/177
index 0aeb8e4eb313c4a22096549d4555895fe9526c14..ec65d28b9a80386009b01a506644a0946f7be015 100755 (executable)
--- a/tests/generic/177
+++ b/tests/generic/177
@@ -54,11 +54,11 @@ _require_scratch
 _require_xfs_io_command "fpunch"
 _require_xfs_io_command "fiemap"
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/311 b/tests/generic/311
index d5102040548bf41a841c56c11f6a954efb350904..50a464ececaa9e09e831ff5b563d67d0ff08275d 100755 (executable)
--- a/tests/generic/311
+++ b/tests/generic/311
@@ -56,7 +56,6 @@ _supported_os Linux
 _require_scratch_nocheck
 _require_odirect
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 # xfs_io is not required for this test, but it's the best way to verify
 # the test system supports fallocate() for allocation
@@ -97,6 +96,7 @@ _run_test()
 }
 
 _scratch_mkfs >> $seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 
 # Create a basic flakey device that will never error out
 _init_flakey

diff --git a/tests/generic/321 b/tests/generic/321
index 8798503186b7f27d890eb0392150cb59bca6e2c3..6cf80e2daa10458f670a242454debdd351c75e99 100755 (executable)
--- a/tests/generic/321
+++ b/tests/generic/321
@@ -44,7 +44,6 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch_nocheck
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
@@ -118,6 +117,7 @@ _replay_rename_test()
 }
 
 _scratch_mkfs >> $seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 
 # Create a basic flakey device that will never error out
 _init_flakey

diff --git a/tests/generic/322 b/tests/generic/322
index 475a31ceb7aa14cf79d0914c1a8810ec5e8eeb86..60ae5eab6b2a8325b752e33782b2c79dc5a9aa07 100755 (executable)
--- a/tests/generic/322
+++ b/tests/generic/322
@@ -44,7 +44,6 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch_nocheck
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
@@ -93,6 +92,7 @@ _write_after_fsync_rename_test()
 }
 
 _scratch_mkfs >> $seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 
 # Create a basic flakey device that will never error out
 _init_flakey

diff --git a/tests/generic/325 b/tests/generic/325
index a0b641a20fe0a39ac8ff8bbfdf2b9fc926f7cb39..fc5bbedfb8d2ea7af2b0147b7ff6fd3df738b474 100755 (executable)
--- a/tests/generic/325
+++ b/tests/generic/325
@@ -54,12 +54,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >> $seqres.full 2>&1
-
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/335 b/tests/generic/335
index 0f79b6db5ee0ed8be3cdec0fa805280214065ebf..d9ca2683a2c5a5e2ecc2296eb8c801a7b7826686 100755 (executable)
--- a/tests/generic/335
+++ b/tests/generic/335
@@ -49,11 +49,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/336 b/tests/generic/336
index acf9856b9619bf5ccfae2f924e6018202faeaaca..82e74295baec3bbc3a2922a9dc27031298f61e9b 100755 (executable)
--- a/tests/generic/336
+++ b/tests/generic/336
@@ -50,11 +50,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/341 b/tests/generic/341
index 1fde346adc8507f5c9dc1af29f695949a45359b4..8102a617b72ce93f59c7944c0cba8273e914e5d6 100755 (executable)
--- a/tests/generic/341
+++ b/tests/generic/341
@@ -50,11 +50,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/342 b/tests/generic/342
index f1edc2df26532a4280f2fe4ac280829393c5d998..ed64e0593074b5fa2a1d75c0d0bff487c279eb88 100755 (executable)
--- a/tests/generic/342
+++ b/tests/generic/342
@@ -50,11 +50,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/343 b/tests/generic/343
index bc7980cfd31744ea6e1066fda60de267ac210c37..bbc57c41d88459797c506239fa4807621c1238cc 100755 (executable)
--- a/tests/generic/343
+++ b/tests/generic/343
@@ -50,11 +50,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/348 b/tests/generic/348
index a14e2e954ebf2ea2e1bf4c3c15a1305e85b73500..3cf85659b00774faa1b5f2798e25b067b2d509de 100755 (executable)
--- a/tests/generic/348
+++ b/tests/generic/348
@@ -50,11 +50,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/generic/376 b/tests/generic/376
index a519203fb2c4b0be6a5a89038ad1d1439676b36b..ad32cba19fb213254698156c6e4cca1001bc4a8d 100755 (executable)
--- a/tests/generic/376
+++ b/tests/generic/376
@@ -50,11 +50,11 @@ _supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_dm_target flakey
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >>$seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey
 

diff --git a/tests/shared/002 b/tests/shared/002
index 88b28260b995f3c96f8a52c377af0ed56d9bcb21..0b278396de5c86c5a86d7b4af2afb3665ebfc394 100755 (executable)
--- a/tests/shared/002
+++ b/tests/shared/002
@@ -60,11 +60,11 @@ _supported_os Linux
 _require_scratch
 _require_dm_target flakey
 _require_attrs
-_require_metadata_journaling $SCRATCH_DEV
 
 rm -f $seqres.full
 
 _scratch_mkfs >> $seqres.full 2>&1
+_require_metadata_journaling $SCRATCH_DEV
 _init_flakey
 _mount_flakey