From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Tue, 2 Feb 2016 01:57:11 +0000 (-0800)
Subject: reflink: remove redundant filesystem checks from the end of the tests
X-Git-Tag: v2022.05.01~2649
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0a2b768cb714ba612c9ae02739845f5a00e1be55;p=users%2Fhch%2Fxfstests-dev.git

reflink: remove redundant filesystem checks from the end of the tests

Turns out that check already runs _check_filesystems after each test,
so we don't need to do this at the end of each test.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---

diff --git a/tests/generic/157 b/tests/generic/157
index 015086614..74314d885 100755
--- a/tests/generic/157
+++ b/tests/generic/157
@@ -123,7 +123,6 @@ _reflink_range "$testdir2/file1" 0 "$testdir2/file2" 0 $blksz >> "$seqres.full"
 
 echo "Check scratch fs"
 _scratch_unmount
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/158 b/tests/generic/158
index 807c247fd..779d55eac 100755
--- a/tests/generic/158
+++ b/tests/generic/158
@@ -124,7 +124,6 @@ _dedupe_range "$testdir2/file1" 0 "$testdir2/file2" 0 $blksz >> "$seqres.full"
 
 echo "Check scratch fs"
 _scratch_unmount
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/161 b/tests/generic/161
index 7fb89632e..b271936ab 100755
--- a/tests/generic/161
+++ b/tests/generic/161
@@ -71,7 +71,6 @@ wait
 
 echo "Check fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 echo "Done"
 # success, all done
diff --git a/tests/generic/162 b/tests/generic/162
index 2fb947a05..30c761be9 100755
--- a/tests/generic/162
+++ b/tests/generic/162
@@ -87,7 +87,6 @@ wait
 
 echo "Check fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 echo "Done"
 # success, all done
diff --git a/tests/generic/163 b/tests/generic/163
index 018644359..f2ea3341d 100755
--- a/tests/generic/163
+++ b/tests/generic/163
@@ -87,7 +87,6 @@ wait
 
 echo "Check fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 echo "Done"
 # success, all done
diff --git a/tests/generic/164 b/tests/generic/164
index 087c6ba03..e97ac1316 100755
--- a/tests/generic/164
+++ b/tests/generic/164
@@ -97,7 +97,6 @@ wait
 
 echo "Check fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 echo "Done"
 # success, all done
diff --git a/tests/generic/165 b/tests/generic/165
index 6bd15e171..b30507957 100755
--- a/tests/generic/165
+++ b/tests/generic/165
@@ -97,7 +97,6 @@ wait
 
 echo "Check fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 echo "Done"
 # success, all done
diff --git a/tests/generic/166 b/tests/generic/166
index 6cfb82119..2c2ff4ecf 100755
--- a/tests/generic/166
+++ b/tests/generic/166
@@ -84,7 +84,6 @@ wait
 
 echo "Check for damage"
 _scratch_unmount
-_check_scratch_fs
 
 echo "Done"
 
diff --git a/tests/generic/167 b/tests/generic/167
index fc5a86c06..b80b48144 100755
--- a/tests/generic/167
+++ b/tests/generic/167
@@ -84,7 +84,6 @@ wait
 
 echo "Check for damage"
 _scratch_unmount
-_check_scratch_fs
 
 echo "Done"
 
diff --git a/tests/generic/168 b/tests/generic/168
index ee3848dba..0d620da7f 100755
--- a/tests/generic/168
+++ b/tests/generic/168
@@ -88,7 +88,6 @@ wait
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 echo "Done"
 
diff --git a/tests/generic/170 b/tests/generic/170
index 6d2781071..78ed63d8d 100755
--- a/tests/generic/170
+++ b/tests/generic/170
@@ -88,7 +88,6 @@ wait
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 echo "Done"
 
diff --git a/tests/generic/171 b/tests/generic/171
index ec3729d0c..4b4f14146 100755
--- a/tests/generic/171
+++ b/tests/generic/171
@@ -100,7 +100,6 @@ echo "${out}"
 
 echo "Check scratch fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/172 b/tests/generic/172
index 1988c8d8d..98eb97ff4 100755
--- a/tests/generic/172
+++ b/tests/generic/172
@@ -100,7 +100,6 @@ echo "${out}"
 
 echo "Check scratch fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/173 b/tests/generic/173
index 5bb9ce6ef..e26f5a974 100755
--- a/tests/generic/173
+++ b/tests/generic/173
@@ -102,7 +102,6 @@ fi
 
 echo "Check scratch fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/174 b/tests/generic/174
index a8e0bb55e..1749a1c6f 100755
--- a/tests/generic/174
+++ b/tests/generic/174
@@ -100,7 +100,6 @@ echo "${out}"
 
 echo "Check scratch fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/175 b/tests/generic/175
index b37ff6606..ac2f54f59 100755
--- a/tests/generic/175
+++ b/tests/generic/175
@@ -92,7 +92,6 @@ _check_scratch_fs
 echo "Remove all files and recheck"
 _scratch_mount >> "$seqres.full" 2>&1
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/176 b/tests/generic/176
index 0ca0b177d..e32f94fea 100755
--- a/tests/generic/176
+++ b/tests/generic/176
@@ -74,7 +74,6 @@ done
 
 echo "Check scratch fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/183 b/tests/generic/183
index 8141f38d9..27179fd9e 100755
--- a/tests/generic/183
+++ b/tests/generic/183
@@ -94,7 +94,6 @@ md5sum "$testdir/file3.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/185 b/tests/generic/185
index 1d6dff24e..368260d89 100755
--- a/tests/generic/185
+++ b/tests/generic/185
@@ -94,7 +94,6 @@ md5sum "$testdir/file3.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/186 b/tests/generic/186
index 9aac96651..67e52b5db 100755
--- a/tests/generic/186
+++ b/tests/generic/186
@@ -139,7 +139,6 @@ md5sum "$testdir/file3.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/187 b/tests/generic/187
index b3f154271..c9933943f 100755
--- a/tests/generic/187
+++ b/tests/generic/187
@@ -139,7 +139,6 @@ md5sum "$testdir/file3.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/188 b/tests/generic/188
index c67b847d3..9e633887c 100755
--- a/tests/generic/188
+++ b/tests/generic/188
@@ -89,7 +89,6 @@ md5sum "$testdir/file3.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/189 b/tests/generic/189
index 1954235d2..661129c2e 100755
--- a/tests/generic/189
+++ b/tests/generic/189
@@ -89,7 +89,6 @@ md5sum "$testdir/file3.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/190 b/tests/generic/190
index d3d573b90..4e272c260 100755
--- a/tests/generic/190
+++ b/tests/generic/190
@@ -89,7 +89,6 @@ md5sum "$testdir/file3.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/191 b/tests/generic/191
index 8b1908455..5aadded86 100755
--- a/tests/generic/191
+++ b/tests/generic/191
@@ -89,7 +89,6 @@ md5sum "$testdir/file3.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/194 b/tests/generic/194
index 1fc2cd7a1..a17debc04 100755
--- a/tests/generic/194
+++ b/tests/generic/194
@@ -94,7 +94,6 @@ md5sum "$testdir/file3.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/195 b/tests/generic/195
index 087275cd6..f49d0c244 100755
--- a/tests/generic/195
+++ b/tests/generic/195
@@ -94,7 +94,6 @@ md5sum "$testdir/file3.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/196 b/tests/generic/196
index d81523298..4da9c76de 100755
--- a/tests/generic/196
+++ b/tests/generic/196
@@ -89,7 +89,6 @@ md5sum "$testdir/file3.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/197 b/tests/generic/197
index 54005aeb8..54ee5ab25 100755
--- a/tests/generic/197
+++ b/tests/generic/197
@@ -89,7 +89,6 @@ md5sum "$testdir/file3.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/199 b/tests/generic/199
index eb567e42c..5e4bca8bf 100755
--- a/tests/generic/199
+++ b/tests/generic/199
@@ -118,7 +118,6 @@ md5sum "$testdir/file3.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/200 b/tests/generic/200
index 991fed024..f0521ae6b 100755
--- a/tests/generic/200
+++ b/tests/generic/200
@@ -118,7 +118,6 @@ md5sum "$testdir/file3.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/201 b/tests/generic/201
index ffc1ce475..db77a5e91 100755
--- a/tests/generic/201
+++ b/tests/generic/201
@@ -79,7 +79,6 @@ rm "$testdir/file3"
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/202 b/tests/generic/202
index 375b65f08..91f2d9b15 100755
--- a/tests/generic/202
+++ b/tests/generic/202
@@ -79,7 +79,6 @@ md5sum "$testdir/file2.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/203 b/tests/generic/203
index 549f2ba64..86a672b49 100755
--- a/tests/generic/203
+++ b/tests/generic/203
@@ -79,7 +79,6 @@ md5sum "$testdir/file2.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/205 b/tests/generic/205
index 8f0ec450e..8fed95527 100755
--- a/tests/generic/205
+++ b/tests/generic/205
@@ -95,7 +95,6 @@ cmp -s "$testdir/file2" "$testdir/file2.chk" || _fail "file2 and file2.chk don't
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/206 b/tests/generic/206
index f2c4ecc36..10b5285d4 100755
--- a/tests/generic/206
+++ b/tests/generic/206
@@ -95,7 +95,6 @@ cmp -s "$testdir/file2" "$testdir/file2.chk" || _fail "file2 and file2.chk don't
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/216 b/tests/generic/216
index 3789cb07b..671f0c16e 100755
--- a/tests/generic/216
+++ b/tests/generic/216
@@ -96,7 +96,6 @@ cmp -s "$testdir/file2" "$testdir/file2.chk" || _fail "file2 and file2.chk don't
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/217 b/tests/generic/217
index 4ae603f14..e4d40c739 100755
--- a/tests/generic/217
+++ b/tests/generic/217
@@ -96,7 +96,6 @@ cmp -s "$testdir/file2" "$testdir/file2.chk" || _fail "file2 and file2.chk don't
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/218 b/tests/generic/218
index d63c06f96..eb52fea8a 100755
--- a/tests/generic/218
+++ b/tests/generic/218
@@ -90,7 +90,6 @@ cmp -s "$testdir/file2" "$testdir/file2.chk" || _fail "file2 and file2.chk don't
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/220 b/tests/generic/220
index ccdb32e82..fb5ecdae1 100755
--- a/tests/generic/220
+++ b/tests/generic/220
@@ -90,7 +90,6 @@ cmp -s "$testdir/file2" "$testdir/file2.chk" || _fail "file2 and file2.chk don't
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/222 b/tests/generic/222
index cb5a78817..ab3f65f8c 100755
--- a/tests/generic/222
+++ b/tests/generic/222
@@ -96,7 +96,6 @@ cmp -s "$testdir/file2" "$testdir/file2.chk" || _fail "file2 and file2.chk don't
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/227 b/tests/generic/227
index d2004248b..387c7140b 100755
--- a/tests/generic/227
+++ b/tests/generic/227
@@ -96,7 +96,6 @@ cmp -s "$testdir/file2" "$testdir/file2.chk" || _fail "file2 and file2.chk don't
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/229 b/tests/generic/229
index cdaddafce..eb105a328 100755
--- a/tests/generic/229
+++ b/tests/generic/229
@@ -156,7 +156,6 @@ runtest delalloc regular "$testdir/d-r"
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/238 b/tests/generic/238
index 98530e080..02057ad8d 100755
--- a/tests/generic/238
+++ b/tests/generic/238
@@ -156,7 +156,6 @@ runtest delalloc regular "$testdir/d-r"
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/242 b/tests/generic/242
index a5a17c397..3023ac7d3 100755
--- a/tests/generic/242
+++ b/tests/generic/242
@@ -92,7 +92,6 @@ md5sum "$testdir/file2.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/generic/243 b/tests/generic/243
index b7ca466e7..e65347f68 100755
--- a/tests/generic/243
+++ b/tests/generic/243
@@ -92,7 +92,6 @@ md5sum "$testdir/file2.chk" | _filter_scratch
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/xfs/127 b/tests/xfs/127
index c31cd1747..63d589051 100755
--- a/tests/xfs/127
+++ b/tests/xfs/127
@@ -72,7 +72,6 @@ xfs_info "$SCRATCH_MNT" >> "$seqres.full"
 
 echo "Check scratch fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/xfs/128 b/tests/xfs/128
index c9547fbea..2e1da3fb1 100755
--- a/tests/xfs/128
+++ b/tests/xfs/128
@@ -142,7 +142,6 @@ _within_tolerance "free blocks after all tests" $free_blocks3 $((free_blocks0 -
 
 echo "Check scratch fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/xfs/131 b/tests/xfs/131
index 844282120..adab31f44 100755
--- a/tests/xfs/131
+++ b/tests/xfs/131
@@ -69,7 +69,6 @@ test -s "$testdir/file2" && _fail "Should not be able to reflink a realtime file
 
 echo "Check restored fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/xfs/139 b/tests/xfs/139
index 51c903e50..feb55bd1a 100755
--- a/tests/xfs/139
+++ b/tests/xfs/139
@@ -75,7 +75,6 @@ md5sum "$testdir/file2" | _filter_scratch
 
 echo "Check scratch fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
diff --git a/tests/xfs/140 b/tests/xfs/140
index 133bb72d6..309b2842f 100644
--- a/tests/xfs/140
+++ b/tests/xfs/140
@@ -82,7 +82,6 @@ cmp -s "$testdir/file2" "$testdir/file2.chk" || echo "file2 and file2.chk do not
 
 echo "Check scratch fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0