From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Wed, 10 Feb 2016 00:44:06 +0000 (-0800)
Subject: reflink: remove unnecessary umounts from test code
X-Git-Tag: v2022.05.01~2648
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=89f436e3ac0c14213ba0860ca5b1375f58b8a6f0;p=xfstests-dev.git

reflink: remove unnecessary umounts from test code

The test harness already takes care of this, so get rid of it.

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

diff --git a/tests/generic/157 b/tests/generic/157
index 74314d88..19a9a189 100755
--- a/tests/generic/157
+++ b/tests/generic/157
@@ -121,9 +121,6 @@ echo "Reflink two files"
 _reflink_range "$testdir1/file1" 0 "$testdir1/file2" 0 $blksz >> "$seqres.full"
 _reflink_range "$testdir2/file1" 0 "$testdir2/file2" 0 $blksz >> "$seqres.full"
 
-echo "Check scratch fs"
-_scratch_unmount
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/157.out b/tests/generic/157.out
index ac3c4406..d4f64b44 100644
--- a/tests/generic/157.out
+++ b/tests/generic/157.out
@@ -22,4 +22,3 @@ XFS_IOC_CLONE_RANGE: Invalid argument
 Try to reflink an append-only file
 XFS_IOC_CLONE_RANGE: Bad file descriptor
 Reflink two files
-Check scratch fs
diff --git a/tests/generic/158 b/tests/generic/158
index 779d55ea..4b51973c 100755
--- a/tests/generic/158
+++ b/tests/generic/158
@@ -122,9 +122,6 @@ echo "Dedupe two files"
 _dedupe_range "$testdir1/file1" 0 "$testdir1/file2" 0 $blksz >> "$seqres.full"
 _dedupe_range "$testdir2/file1" 0 "$testdir2/file2" 0 $blksz >> "$seqres.full"
 
-echo "Check scratch fs"
-_scratch_unmount
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/158.out b/tests/generic/158.out
index dff36925..7f884034 100644
--- a/tests/generic/158.out
+++ b/tests/generic/158.out
@@ -21,4 +21,3 @@ Try to dedupe to a fifo
 dedupe: Invalid argument
 Try to dedupe an append-only file
 Dedupe two files
-Check scratch fs
diff --git a/tests/generic/161 b/tests/generic/161
index b271936a..1d5364e3 100755
--- a/tests/generic/161
+++ b/tests/generic/161
@@ -69,10 +69,6 @@ rm -rf "$testdir/file1" &
 _pwrite_byte 0x62 0 $((loops * blksz)) "$testdir/file1" >> "$seqres.full"
 wait
 
-echo "Check fs"
-umount "$SCRATCH_MNT"
-
-echo "Done"
 # success, all done
 status=0
 exit
diff --git a/tests/generic/161.out b/tests/generic/161.out
index 1db11c30..34cb6f2c 100644
--- a/tests/generic/161.out
+++ b/tests/generic/161.out
@@ -2,5 +2,3 @@ QA output created by 161
 Format and mount
 Initialize files
 Delete while rewriting
-Check fs
-Done
diff --git a/tests/generic/162 b/tests/generic/162
index 30c761be..90445451 100755
--- a/tests/generic/162
+++ b/tests/generic/162
@@ -85,10 +85,6 @@ echo "Finished dedupeing"
 touch "$testdir/finished"
 wait
 
-echo "Check fs"
-umount "$SCRATCH_MNT"
-
-echo "Done"
 # success, all done
 status=0
 exit
diff --git a/tests/generic/162.out b/tests/generic/162.out
index 4481f8cd..e57db123 100644
--- a/tests/generic/162.out
+++ b/tests/generic/162.out
@@ -3,5 +3,3 @@ Format and mount
 Initialize files
 Dedupe and rewrite the file!
 Finished dedupeing
-Check fs
-Done
diff --git a/tests/generic/163 b/tests/generic/163
index f2ea3341..651d4457 100755
--- a/tests/generic/163
+++ b/tests/generic/163
@@ -85,10 +85,6 @@ echo "Finished dedupeing"
 touch "$testdir/finished"
 wait
 
-echo "Check fs"
-umount "$SCRATCH_MNT"
-
-echo "Done"
 # success, all done
 status=0
 exit
diff --git a/tests/generic/163.out b/tests/generic/163.out
index 2d27d1bf..604e53ba 100644
--- a/tests/generic/163.out
+++ b/tests/generic/163.out
@@ -3,5 +3,3 @@ Format and mount
 Initialize files
 Dedupe and rewrite the file!
 Finished dedupeing
-Check fs
-Done
diff --git a/tests/generic/164 b/tests/generic/164
index e97ac131..6c19c7d8 100755
--- a/tests/generic/164
+++ b/tests/generic/164
@@ -95,10 +95,6 @@ echo "Finished reflinking"
 touch "$testdir/finished"
 wait
 
-echo "Check fs"
-umount "$SCRATCH_MNT"
-
-echo "Done"
 # success, all done
 status=0
 exit
diff --git a/tests/generic/164.out b/tests/generic/164.out
index 0b4ed70a..f4ff8696 100644
--- a/tests/generic/164.out
+++ b/tests/generic/164.out
@@ -3,5 +3,3 @@ Format and mount
 Initialize files
 Reflink and reread the files!
 Finished reflinking
-Check fs
-Done
diff --git a/tests/generic/165 b/tests/generic/165
index b3050795..2e380a90 100755
--- a/tests/generic/165
+++ b/tests/generic/165
@@ -95,10 +95,6 @@ echo "Finished reflinking"
 touch "$testdir/finished"
 wait
 
-echo "Check fs"
-umount "$SCRATCH_MNT"
-
-echo "Done"
 # success, all done
 status=0
 exit
diff --git a/tests/generic/165.out b/tests/generic/165.out
index a89071d1..31e9bef5 100644
--- a/tests/generic/165.out
+++ b/tests/generic/165.out
@@ -3,5 +3,3 @@ Format and mount
 Initialize files
 Reflink and dio reread the files!
 Finished reflinking
-Check fs
-Done
diff --git a/tests/generic/166 b/tests/generic/166
index 2c2ff4ec..028ee111 100755
--- a/tests/generic/166
+++ b/tests/generic/166
@@ -82,11 +82,6 @@ done
 touch $testdir/finished
 wait
 
-echo "Check for damage"
-_scratch_unmount
-
-echo "Done"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/166.out b/tests/generic/166.out
index a2ba34e2..8cb81a00 100644
--- a/tests/generic/166.out
+++ b/tests/generic/166.out
@@ -2,5 +2,3 @@ QA output created by 166
 Format and mount
 Initialize file
 Snapshot a file undergoing directio rewrite
-Check for damage
-Done
diff --git a/tests/generic/167 b/tests/generic/167
index b80b4814..a4bf4f4c 100755
--- a/tests/generic/167
+++ b/tests/generic/167
@@ -82,11 +82,6 @@ done
 touch $testdir/finished
 wait
 
-echo "Check for damage"
-_scratch_unmount
-
-echo "Done"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/167.out b/tests/generic/167.out
index 7cfb14e5..a0e90b16 100644
--- a/tests/generic/167.out
+++ b/tests/generic/167.out
@@ -2,5 +2,3 @@ QA output created by 167
 Format and mount
 Initialize file
 Snapshot a file undergoing buffered rewrite
-Check for damage
-Done
diff --git a/tests/generic/168 b/tests/generic/168
index 0d620da7..2ffc5b67 100755
--- a/tests/generic/168
+++ b/tests/generic/168
@@ -86,11 +86,6 @@ done
 touch "$testdir/finished"
 wait
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
-echo "Done"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/168.out b/tests/generic/168.out
index d0dd08ed..2687e7c2 100644
--- a/tests/generic/168.out
+++ b/tests/generic/168.out
@@ -2,5 +2,3 @@ QA output created by 168
 Format and mount
 Initialize files
 Reflink and write the target
-Check for damage
-Done
diff --git a/tests/generic/170 b/tests/generic/170
index 78ed63d8..2a81cadd 100755
--- a/tests/generic/170
+++ b/tests/generic/170
@@ -86,11 +86,6 @@ done
 touch "$testdir/finished"
 wait
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
-echo "Done"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/170.out b/tests/generic/170.out
index 103aaa55..debd6ca0 100644
--- a/tests/generic/170.out
+++ b/tests/generic/170.out
@@ -2,5 +2,3 @@ QA output created by 170
 Format and mount
 Initialize files
 Reflink and dio write the target
-Check for damage
-Done
diff --git a/tests/generic/171 b/tests/generic/171
index 4b4f1414..d865f64f 100755
--- a/tests/generic/171
+++ b/tests/generic/171
@@ -95,12 +95,6 @@ echo "${out}" | grep -q "No space left on device" || echo "CoW should have faile
 echo "${out}" >> "$seqres.full" 2>&1
 echo "${out}"
 
-#filefrag -v $testdir/bigfile
-#filefrag -v $testdir/clonefile
-
-echo "Check scratch fs"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/171.out b/tests/generic/171.out
index c2b0dddc..a999eb00 100644
--- a/tests/generic/171.out
+++ b/tests/generic/171.out
@@ -7,4 +7,3 @@ CoW the big file
 pwrite64: No space left on device
 Remount and try CoW again
 pwrite64: No space left on device
-Check scratch fs
diff --git a/tests/generic/172 b/tests/generic/172
index 98eb97ff..e6020f15 100755
--- a/tests/generic/172
+++ b/tests/generic/172
@@ -95,12 +95,6 @@ echo "${out}" | grep -q "No space left on device" || echo "CoW should have faile
 echo "${out}" >> "$seqres.full" 2>&1
 echo "${out}"
 
-#filefrag -v $testdir/bigfile
-#filefrag -v $testdir/clonefile
-
-echo "Check scratch fs"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/172.out b/tests/generic/172.out
index 3913dd7e..4d3f710b 100644
--- a/tests/generic/172.out
+++ b/tests/generic/172.out
@@ -7,4 +7,3 @@ CoW the big file
 pwrite64: No space left on device
 Remount and try CoW again
 pwrite64: No space left on device
-Check scratch fs
diff --git a/tests/generic/173 b/tests/generic/173
index e26f5a97..61c6b326 100755
--- a/tests/generic/173
+++ b/tests/generic/173
@@ -97,12 +97,6 @@ if [ "$err" -lt 128 ]; then
 	echo "mmap CoW should have failed with SIGBUS, got SIG$(kill -l $err)"
 fi
 
-#filefrag -v $testdir/bigfile
-#filefrag -v $testdir/clonefile
-
-echo "Check scratch fs"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/173.out b/tests/generic/173.out
index 49abb17a..5235548e 100644
--- a/tests/generic/173.out
+++ b/tests/generic/173.out
@@ -5,4 +5,3 @@ Create a big file and reflink it
 Allocate the rest of the space
 mmap CoW the big file
 Remount and try CoW again
-Check scratch fs
diff --git a/tests/generic/174 b/tests/generic/174
index 1749a1c6..dd6fe5ae 100755
--- a/tests/generic/174
+++ b/tests/generic/174
@@ -95,12 +95,6 @@ echo "${out}" | grep -q "No space left on device" || echo "CoW should have faile
 echo "${out}" >> "$seqres.full" 2>&1
 echo "${out}"
 
-#filefrag -v $testdir/bigfile
-#filefrag -v $testdir/clonefile
-
-echo "Check scratch fs"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/174.out b/tests/generic/174.out
index 702d0675..1490ca4d 100644
--- a/tests/generic/174.out
+++ b/tests/generic/174.out
@@ -7,4 +7,3 @@ CoW the big file
 pwrite64: No space left on device
 Remount and try CoW again
 pwrite64: No space left on device
-Check scratch fs
diff --git a/tests/generic/183 b/tests/generic/183
index 27179fd9..c928acd7 100755
--- a/tests/generic/183
+++ b/tests/generic/183
@@ -92,9 +92,6 @@ md5sum "$testdir/file2" | _filter_scratch
 md5sum "$testdir/file3" | _filter_scratch
 md5sum "$testdir/file3.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/183.out b/tests/generic/183.out
index e5d03225..b777908d 100644
--- a/tests/generic/183.out
+++ b/tests/generic/183.out
@@ -12,4 +12,3 @@ bdbcf02ee0aa977795a79d25fcfdccb1  SCRATCH_MNT/test-183/file1
 b83f9394092e15bdcda585cd8e776dc6  SCRATCH_MNT/test-183/file2
 55968a95dfc0120df4e8485576514320  SCRATCH_MNT/test-183/file3
 55968a95dfc0120df4e8485576514320  SCRATCH_MNT/test-183/file3.chk
-Check for damage
diff --git a/tests/generic/185 b/tests/generic/185
index 368260d8..fb05e6d7 100755
--- a/tests/generic/185
+++ b/tests/generic/185
@@ -92,9 +92,6 @@ md5sum "$testdir/file2" | _filter_scratch
 md5sum "$testdir/file3" | _filter_scratch
 md5sum "$testdir/file3.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/185.out b/tests/generic/185.out
index e505c901..4d1839a3 100644
--- a/tests/generic/185.out
+++ b/tests/generic/185.out
@@ -12,4 +12,3 @@ bdbcf02ee0aa977795a79d25fcfdccb1  SCRATCH_MNT/test-185/file1
 b83f9394092e15bdcda585cd8e776dc6  SCRATCH_MNT/test-185/file2
 55968a95dfc0120df4e8485576514320  SCRATCH_MNT/test-185/file3
 55968a95dfc0120df4e8485576514320  SCRATCH_MNT/test-185/file3.chk
-Check for damage
diff --git a/tests/generic/186 b/tests/generic/186
index 67e52b5d..e495cbcb 100755
--- a/tests/generic/186
+++ b/tests/generic/186
@@ -137,9 +137,6 @@ md5sum "$testdir/file2" | _filter_scratch
 md5sum "$testdir/file3" | _filter_scratch
 md5sum "$testdir/file3.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/186.out b/tests/generic/186.out
index adfae9c9..961673a8 100644
--- a/tests/generic/186.out
+++ b/tests/generic/186.out
@@ -12,4 +12,3 @@ Compare files
 35219c511215d00a857243965ea5ed9c  SCRATCH_MNT/test-186/file2
 1801718b8daeb8d3ad4900bd9137b3e8  SCRATCH_MNT/test-186/file3
 1801718b8daeb8d3ad4900bd9137b3e8  SCRATCH_MNT/test-186/file3.chk
-Check for damage
diff --git a/tests/generic/187 b/tests/generic/187
index c9933943..e3461ab4 100755
--- a/tests/generic/187
+++ b/tests/generic/187
@@ -137,9 +137,6 @@ md5sum "$testdir/file2" | _filter_scratch
 md5sum "$testdir/file3" | _filter_scratch
 md5sum "$testdir/file3.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/187.out b/tests/generic/187.out
index a3c05a5a..8ad56f8a 100644
--- a/tests/generic/187.out
+++ b/tests/generic/187.out
@@ -12,4 +12,3 @@ Compare files
 35219c511215d00a857243965ea5ed9c  SCRATCH_MNT/test-187/file2
 1801718b8daeb8d3ad4900bd9137b3e8  SCRATCH_MNT/test-187/file3
 1801718b8daeb8d3ad4900bd9137b3e8  SCRATCH_MNT/test-187/file3.chk
-Check for damage
diff --git a/tests/generic/188 b/tests/generic/188
index 9e633887..7596c4b9 100755
--- a/tests/generic/188
+++ b/tests/generic/188
@@ -87,9 +87,6 @@ md5sum "$testdir/file1" | _filter_scratch
 md5sum "$testdir/file3" | _filter_scratch
 md5sum "$testdir/file3.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/188.out b/tests/generic/188.out
index 135e69cc..904f3835 100644
--- a/tests/generic/188.out
+++ b/tests/generic/188.out
@@ -10,4 +10,3 @@ Compare files
 bdbcf02ee0aa977795a79d25fcfdccb1  SCRATCH_MNT/test-188/file1
 09101629908f9bdd5d178e7ce20bb1bb  SCRATCH_MNT/test-188/file3
 09101629908f9bdd5d178e7ce20bb1bb  SCRATCH_MNT/test-188/file3.chk
-Check for damage
diff --git a/tests/generic/189 b/tests/generic/189
index 661129c2..130dc58a 100755
--- a/tests/generic/189
+++ b/tests/generic/189
@@ -87,9 +87,6 @@ md5sum "$testdir/file1" | _filter_scratch
 md5sum "$testdir/file3" | _filter_scratch
 md5sum "$testdir/file3.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/189.out b/tests/generic/189.out
index ce868bd3..feff6059 100644
--- a/tests/generic/189.out
+++ b/tests/generic/189.out
@@ -10,4 +10,3 @@ Compare files
 bdbcf02ee0aa977795a79d25fcfdccb1  SCRATCH_MNT/test-189/file1
 09101629908f9bdd5d178e7ce20bb1bb  SCRATCH_MNT/test-189/file3
 09101629908f9bdd5d178e7ce20bb1bb  SCRATCH_MNT/test-189/file3.chk
-Check for damage
diff --git a/tests/generic/190 b/tests/generic/190
index 4e272c26..01714753 100755
--- a/tests/generic/190
+++ b/tests/generic/190
@@ -87,9 +87,6 @@ md5sum "$testdir/file1" | _filter_scratch
 md5sum "$testdir/file3" | _filter_scratch
 md5sum "$testdir/file3.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/190.out b/tests/generic/190.out
index abe5d89a..ad8ecb06 100644
--- a/tests/generic/190.out
+++ b/tests/generic/190.out
@@ -10,4 +10,3 @@ Compare files
 bdbcf02ee0aa977795a79d25fcfdccb1  SCRATCH_MNT/test-190/file1
 09101629908f9bdd5d178e7ce20bb1bb  SCRATCH_MNT/test-190/file3
 09101629908f9bdd5d178e7ce20bb1bb  SCRATCH_MNT/test-190/file3.chk
-Check for damage
diff --git a/tests/generic/191 b/tests/generic/191
index 5aadded8..34d96f95 100755
--- a/tests/generic/191
+++ b/tests/generic/191
@@ -87,9 +87,6 @@ md5sum "$testdir/file1" | _filter_scratch
 md5sum "$testdir/file3" | _filter_scratch
 md5sum "$testdir/file3.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/191.out b/tests/generic/191.out
index 8116eab3..1b5e1758 100644
--- a/tests/generic/191.out
+++ b/tests/generic/191.out
@@ -10,4 +10,3 @@ Compare files
 bdbcf02ee0aa977795a79d25fcfdccb1  SCRATCH_MNT/test-191/file1
 09101629908f9bdd5d178e7ce20bb1bb  SCRATCH_MNT/test-191/file3
 09101629908f9bdd5d178e7ce20bb1bb  SCRATCH_MNT/test-191/file3.chk
-Check for damage
diff --git a/tests/generic/194 b/tests/generic/194
index a17debc0..e9feaadf 100755
--- a/tests/generic/194
+++ b/tests/generic/194
@@ -92,9 +92,6 @@ md5sum "$testdir/file1" | _filter_scratch
 md5sum "$testdir/file3" | _filter_scratch
 md5sum "$testdir/file3.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/194.out b/tests/generic/194.out
index fdfda231..d370b4cd 100644
--- a/tests/generic/194.out
+++ b/tests/generic/194.out
@@ -10,4 +10,3 @@ Compare files
 bdbcf02ee0aa977795a79d25fcfdccb1  SCRATCH_MNT/test-194/file1
 55968a95dfc0120df4e8485576514320  SCRATCH_MNT/test-194/file3
 55968a95dfc0120df4e8485576514320  SCRATCH_MNT/test-194/file3.chk
-Check for damage
diff --git a/tests/generic/195 b/tests/generic/195
index f49d0c24..32548baa 100755
--- a/tests/generic/195
+++ b/tests/generic/195
@@ -92,9 +92,6 @@ md5sum "$testdir/file1" | _filter_scratch
 md5sum "$testdir/file3" | _filter_scratch
 md5sum "$testdir/file3.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/195.out b/tests/generic/195.out
index 94950587..8a6d760b 100644
--- a/tests/generic/195.out
+++ b/tests/generic/195.out
@@ -10,4 +10,3 @@ Compare files
 bdbcf02ee0aa977795a79d25fcfdccb1  SCRATCH_MNT/test-195/file1
 55968a95dfc0120df4e8485576514320  SCRATCH_MNT/test-195/file3
 55968a95dfc0120df4e8485576514320  SCRATCH_MNT/test-195/file3.chk
-Check for damage
diff --git a/tests/generic/196 b/tests/generic/196
index 4da9c76d..4ec2cffb 100755
--- a/tests/generic/196
+++ b/tests/generic/196
@@ -87,9 +87,6 @@ md5sum "$testdir/file1" | _filter_scratch
 md5sum "$testdir/file3" | _filter_scratch
 md5sum "$testdir/file3.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/196.out b/tests/generic/196.out
index 6ee052bd..545b72bb 100644
--- a/tests/generic/196.out
+++ b/tests/generic/196.out
@@ -10,4 +10,3 @@ Compare files
 bdbcf02ee0aa977795a79d25fcfdccb1  SCRATCH_MNT/test-196/file1
 55968a95dfc0120df4e8485576514320  SCRATCH_MNT/test-196/file3
 55968a95dfc0120df4e8485576514320  SCRATCH_MNT/test-196/file3.chk
-Check for damage
diff --git a/tests/generic/197 b/tests/generic/197
index 54ee5ab2..356a587b 100755
--- a/tests/generic/197
+++ b/tests/generic/197
@@ -87,9 +87,6 @@ md5sum "$testdir/file1" | _filter_scratch
 md5sum "$testdir/file3" | _filter_scratch
 md5sum "$testdir/file3.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/197.out b/tests/generic/197.out
index bec294b9..05edad90 100644
--- a/tests/generic/197.out
+++ b/tests/generic/197.out
@@ -10,4 +10,3 @@ Compare files
 bdbcf02ee0aa977795a79d25fcfdccb1  SCRATCH_MNT/test-197/file1
 55968a95dfc0120df4e8485576514320  SCRATCH_MNT/test-197/file3
 55968a95dfc0120df4e8485576514320  SCRATCH_MNT/test-197/file3.chk
-Check for damage
diff --git a/tests/generic/199 b/tests/generic/199
index 5e4bca8b..03b8fdad 100755
--- a/tests/generic/199
+++ b/tests/generic/199
@@ -116,9 +116,6 @@ md5sum "$testdir/file1" | _filter_scratch
 md5sum "$testdir/file3" | _filter_scratch
 md5sum "$testdir/file3.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/199.out b/tests/generic/199.out
index 752742db..b35c135f 100644
--- a/tests/generic/199.out
+++ b/tests/generic/199.out
@@ -10,4 +10,3 @@ Compare files
 bdbcf02ee0aa977795a79d25fcfdccb1  SCRATCH_MNT/test-199/file1
 36f6b5317a9a921fc91175390ccf7f69  SCRATCH_MNT/test-199/file3
 36f6b5317a9a921fc91175390ccf7f69  SCRATCH_MNT/test-199/file3.chk
-Check for damage
diff --git a/tests/generic/200 b/tests/generic/200
index f0521ae6..e71eedcc 100755
--- a/tests/generic/200
+++ b/tests/generic/200
@@ -116,9 +116,6 @@ md5sum "$testdir/file1" | _filter_scratch
 md5sum "$testdir/file3" | _filter_scratch
 md5sum "$testdir/file3.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/200.out b/tests/generic/200.out
index e4ab7e0a..140eff90 100644
--- a/tests/generic/200.out
+++ b/tests/generic/200.out
@@ -10,4 +10,3 @@ Compare files
 bdbcf02ee0aa977795a79d25fcfdccb1  SCRATCH_MNT/test-200/file1
 36f6b5317a9a921fc91175390ccf7f69  SCRATCH_MNT/test-200/file3
 36f6b5317a9a921fc91175390ccf7f69  SCRATCH_MNT/test-200/file3.chk
-Check for damage
diff --git a/tests/generic/201 b/tests/generic/201
index db77a5e9..90087ef2 100755
--- a/tests/generic/201
+++ b/tests/generic/201
@@ -77,9 +77,6 @@ echo "CoW and unmount"
 "$XFS_IO_PROG" -f -c "pwrite -S 0x63 -b $((blksz * nr / 2)) $((blksz * nr / 4)) $((blksz * nr / 2))" "$testdir/file3" >> "$seqres.full"
 rm "$testdir/file3"
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/201.out b/tests/generic/201.out
index 80629b67..52669d27 100644
--- a/tests/generic/201.out
+++ b/tests/generic/201.out
@@ -6,4 +6,3 @@ bdbcf02ee0aa977795a79d25fcfdccb1  SCRATCH_MNT/test-201/file1
 d3959a68638c50af07f0258e032cb554  SCRATCH_MNT/test-201/file3
 d3959a68638c50af07f0258e032cb554  SCRATCH_MNT/test-201/file3.chk
 CoW and unmount
-Check for damage
diff --git a/tests/generic/202 b/tests/generic/202
index 91f2d9b1..e034e4e8 100755
--- a/tests/generic/202
+++ b/tests/generic/202
@@ -77,9 +77,6 @@ md5sum "$testdir/file1" | _filter_scratch
 md5sum "$testdir/file2" | _filter_scratch
 md5sum "$testdir/file2.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/202.out b/tests/generic/202.out
index 8973abec..2dbd4b04 100644
--- a/tests/generic/202.out
+++ b/tests/generic/202.out
@@ -10,4 +10,3 @@ Compare files
 75f550706b7d54e6ae59a8220b532285  SCRATCH_MNT/test-202/file1
 7cd112044b63b2c979f45e7c1e7cc85f  SCRATCH_MNT/test-202/file2
 7cd112044b63b2c979f45e7c1e7cc85f  SCRATCH_MNT/test-202/file2.chk
-Check for damage
diff --git a/tests/generic/203 b/tests/generic/203
index 86a672b4..2b6db7e1 100755
--- a/tests/generic/203
+++ b/tests/generic/203
@@ -77,9 +77,6 @@ md5sum "$testdir/file1" | _filter_scratch
 md5sum "$testdir/file2" | _filter_scratch
 md5sum "$testdir/file2.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/203.out b/tests/generic/203.out
index 84ac0e87..ddde511e 100644
--- a/tests/generic/203.out
+++ b/tests/generic/203.out
@@ -10,4 +10,3 @@ Compare files
 75f550706b7d54e6ae59a8220b532285  SCRATCH_MNT/test-203/file1
 227f44bb2dcf251ebf0217edaeb1e365  SCRATCH_MNT/test-203/file2
 227f44bb2dcf251ebf0217edaeb1e365  SCRATCH_MNT/test-203/file2.chk
-Check for damage
diff --git a/tests/generic/205 b/tests/generic/205
index 8fed9552..8955e677 100755
--- a/tests/generic/205
+++ b/tests/generic/205
@@ -93,9 +93,6 @@ echo "Compare files"
 ! cmp -s "$testdir/file1" "$testdir/file2" || _fail "file1 and file2 don't match."
 cmp -s "$testdir/file2" "$testdir/file2.chk" || _fail "file2 and file2.chk don't match."
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/205.out b/tests/generic/205.out
index 1a225156..c65d1bdc 100644
--- a/tests/generic/205.out
+++ b/tests/generic/205.out
@@ -4,4 +4,3 @@ Create the original files
 Compare files
 CoW and unmount
 Compare files
-Check for damage
diff --git a/tests/generic/206 b/tests/generic/206
index 10b5285d..12ad7455 100755
--- a/tests/generic/206
+++ b/tests/generic/206
@@ -93,9 +93,6 @@ echo "Compare files"
 ! cmp -s "$testdir/file1" "$testdir/file2" || _fail "file1 and file2 don't match."
 cmp -s "$testdir/file2" "$testdir/file2.chk" || _fail "file2 and file2.chk don't match."
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/206.out b/tests/generic/206.out
index 0b1ec608..38c7b09d 100644
--- a/tests/generic/206.out
+++ b/tests/generic/206.out
@@ -4,4 +4,3 @@ Create the original files
 Compare files
 CoW and unmount
 Compare files
-Check for damage
diff --git a/tests/generic/216 b/tests/generic/216
index 671f0c16..3e0084e5 100755
--- a/tests/generic/216
+++ b/tests/generic/216
@@ -94,9 +94,6 @@ echo "Compare files"
 ! cmp -s "$testdir/file1" "$testdir/file2" || _fail "file1 and file2 don't match."
 cmp -s "$testdir/file2" "$testdir/file2.chk" || _fail "file2 and file2.chk don't match."
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/216.out b/tests/generic/216.out
index 2d43c3a2..85db001b 100644
--- a/tests/generic/216.out
+++ b/tests/generic/216.out
@@ -4,4 +4,3 @@ Create the original files
 Compare files
 CoW and unmount
 Compare files
-Check for damage
diff --git a/tests/generic/217 b/tests/generic/217
index e4d40c73..3470d257 100755
--- a/tests/generic/217
+++ b/tests/generic/217
@@ -94,9 +94,6 @@ echo "Compare files"
 ! cmp -s "$testdir/file1" "$testdir/file2" || _fail "file1 and file2 don't match."
 cmp -s "$testdir/file2" "$testdir/file2.chk" || _fail "file2 and file2.chk don't match."
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/217.out b/tests/generic/217.out
index d8eb1bea..bf8bb4f6 100644
--- a/tests/generic/217.out
+++ b/tests/generic/217.out
@@ -4,4 +4,3 @@ Create the original files
 Compare files
 CoW and unmount
 Compare files
-Check for damage
diff --git a/tests/generic/218 b/tests/generic/218
index eb52fea8..220cda31 100755
--- a/tests/generic/218
+++ b/tests/generic/218
@@ -88,9 +88,6 @@ echo "Compare files"
 ! cmp -s "$testdir/file1" "$testdir/file2" || _fail "file1 and file2 don't match."
 cmp -s "$testdir/file2" "$testdir/file2.chk" || _fail "file2 and file2.chk don't match."
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/218.out b/tests/generic/218.out
index 0173be0a..01427478 100644
--- a/tests/generic/218.out
+++ b/tests/generic/218.out
@@ -4,4 +4,3 @@ Create the original files
 Compare files
 CoW and unmount
 Compare files
-Check for damage
diff --git a/tests/generic/220 b/tests/generic/220
index fb5ecdae..151bf765 100755
--- a/tests/generic/220
+++ b/tests/generic/220
@@ -88,9 +88,6 @@ echo "Compare files"
 ! cmp -s "$testdir/file1" "$testdir/file2" || _fail "file1 and file2 don't match."
 cmp -s "$testdir/file2" "$testdir/file2.chk" || _fail "file2 and file2.chk don't match."
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/220.out b/tests/generic/220.out
index 9dcb9d67..a7123e10 100644
--- a/tests/generic/220.out
+++ b/tests/generic/220.out
@@ -4,4 +4,3 @@ Create the original files
 Compare files
 CoW and unmount
 Compare files
-Check for damage
diff --git a/tests/generic/222 b/tests/generic/222
index ab3f65f8..c95a1d6f 100755
--- a/tests/generic/222
+++ b/tests/generic/222
@@ -94,9 +94,6 @@ echo "Compare files"
 ! cmp -s "$testdir/file1" "$testdir/file2" || _fail "file1 and file2 don't match."
 cmp -s "$testdir/file2" "$testdir/file2.chk" || _fail "file2 and file2.chk don't match."
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/222.out b/tests/generic/222.out
index 47bad107..895b3a14 100644
--- a/tests/generic/222.out
+++ b/tests/generic/222.out
@@ -4,4 +4,3 @@ Create the original files
 Compare files
 CoW and unmount
 Compare files
-Check for damage
diff --git a/tests/generic/227 b/tests/generic/227
index 387c7140..d62ab52f 100755
--- a/tests/generic/227
+++ b/tests/generic/227
@@ -94,9 +94,6 @@ echo "Compare files"
 ! cmp -s "$testdir/file1" "$testdir/file2" || _fail "file1 and file2 don't match."
 cmp -s "$testdir/file2" "$testdir/file2.chk" || _fail "file2 and file2.chk don't match."
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/227.out b/tests/generic/227.out
index 69cb88f0..bed3e484 100644
--- a/tests/generic/227.out
+++ b/tests/generic/227.out
@@ -4,4 +4,3 @@ Create the original files
 Compare files
 CoW and unmount
 Compare files
-Check for damage
diff --git a/tests/generic/229 b/tests/generic/229
index eb105a32..cc86b4e7 100755
--- a/tests/generic/229
+++ b/tests/generic/229
@@ -154,9 +154,6 @@ runtest delalloc unwritten "$testdir/d-u"
 runtest delalloc hole "$testdir/d-h"
 runtest delalloc regular "$testdir/d-r"
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/229.out b/tests/generic/229.out
index 07750ace..4955ecdc 100644
--- a/tests/generic/229.out
+++ b/tests/generic/229.out
@@ -80,4 +80,3 @@ Create the original files
 Compare files
 CoW and unmount
 Compare files
-Check for damage
diff --git a/tests/generic/238 b/tests/generic/238
index 02057ad8..c726770b 100755
--- a/tests/generic/238
+++ b/tests/generic/238
@@ -154,9 +154,6 @@ runtest delalloc unwritten "$testdir/d-u"
 runtest delalloc hole "$testdir/d-h"
 runtest delalloc regular "$testdir/d-r"
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/238.out b/tests/generic/238.out
index dcfcc8e1..5f97fb14 100644
--- a/tests/generic/238.out
+++ b/tests/generic/238.out
@@ -80,4 +80,3 @@ Create the original files
 Compare files
 CoW and unmount
 Compare files
-Check for damage
diff --git a/tests/generic/242 b/tests/generic/242
index 3023ac7d..1141aa47 100755
--- a/tests/generic/242
+++ b/tests/generic/242
@@ -90,9 +90,6 @@ md5sum "$testdir/file1" | _filter_scratch
 md5sum "$testdir/file2" | _filter_scratch
 md5sum "$testdir/file2.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/242.out b/tests/generic/242.out
index ef9a5746..34dac8b6 100644
--- a/tests/generic/242.out
+++ b/tests/generic/242.out
@@ -10,4 +10,3 @@ Compare files
 01768a16d33c9bd21dc67a7fac006ee1  SCRATCH_MNT/test-242/file1
 c835fd53fa27b72511b250d51595c053  SCRATCH_MNT/test-242/file2
 c835fd53fa27b72511b250d51595c053  SCRATCH_MNT/test-242/file2.chk
-Check for damage
diff --git a/tests/generic/243 b/tests/generic/243
index e65347f6..a5145915 100755
--- a/tests/generic/243
+++ b/tests/generic/243
@@ -90,9 +90,6 @@ md5sum "$testdir/file1" | _filter_scratch
 md5sum "$testdir/file2" | _filter_scratch
 md5sum "$testdir/file2.chk" | _filter_scratch
 
-echo "Check for damage"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/generic/243.out b/tests/generic/243.out
index 8e13fabd..d76ce6fb 100644
--- a/tests/generic/243.out
+++ b/tests/generic/243.out
@@ -10,4 +10,3 @@ Compare files
 01768a16d33c9bd21dc67a7fac006ee1  SCRATCH_MNT/test-243/file1
 c835fd53fa27b72511b250d51595c053  SCRATCH_MNT/test-243/file2
 c835fd53fa27b72511b250d51595c053  SCRATCH_MNT/test-243/file2.chk
-Check for damage
diff --git a/tests/xfs/127 b/tests/xfs/127
index 63d58905..392e63c5 100755
--- a/tests/xfs/127
+++ b/tests/xfs/127
@@ -70,9 +70,6 @@ _cp_reflink "$testdir/original" "$testdir/copy3"
 
 xfs_info "$SCRATCH_MNT" >> "$seqres.full"
 
-echo "Check scratch fs"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/xfs/127.out b/tests/xfs/127.out
index e4e76e22..317fbdcd 100644
--- a/tests/xfs/127.out
+++ b/tests/xfs/127.out
@@ -3,4 +3,3 @@ Format and mount
 Create the original file and reflink to copy1, copy2
 Grow fs
 Create more reflink copies
-Check scratch fs
diff --git a/tests/xfs/128 b/tests/xfs/128
index 2e1da3fb..f230adf6 100755
--- a/tests/xfs/128
+++ b/tests/xfs/128
@@ -140,9 +140,6 @@ _within_tolerance "free blocks after CoW some reflink copies" $free_blocks2 $((f
 _within_tolerance "free blocks after defragging all reflink copies" $free_blocks3 $((free_blocks2 - (blks * 2 * blksz_factor))) $margin -v
 _within_tolerance "free blocks after all tests" $free_blocks3 $((free_blocks0 - (blks * 3 * blksz_factor))) $margin -v
 
-echo "Check scratch fs"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/xfs/128.out b/tests/xfs/128.out
index 0ac06db2..9c807465 100644
--- a/tests/xfs/128.out
+++ b/tests/xfs/128.out
@@ -24,4 +24,3 @@ free blocks after creating some reflink copies is in range
 free blocks after CoW some reflink copies is in range
 free blocks after defragging all reflink copies is in range
 free blocks after all tests is in range
-Check scratch fs
diff --git a/tests/xfs/131 b/tests/xfs/131
index adab31f4..f553a44c 100755
--- a/tests/xfs/131
+++ b/tests/xfs/131
@@ -67,9 +67,6 @@ _cp_reflink "$testdir/file1" "$testdir/file2" 2>&1 | _filter_scratch
 
 test -s "$testdir/file2" && _fail "Should not be able to reflink a realtime file."
 
-echo "Check restored fs"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/xfs/131.out b/tests/xfs/131.out
index 7b700c9a..3c0186f0 100644
--- a/tests/xfs/131.out
+++ b/tests/xfs/131.out
@@ -3,4 +3,3 @@ Format and mount scratch device
 Create the original file blocks
 Reflink every block
 cp: failed to clone 'SCRATCH_MNT/test-131/file2' from 'SCRATCH_MNT/test-131/file1': Invalid argument
-Check restored fs
diff --git a/tests/xfs/139 b/tests/xfs/139
index feb55bd1..55dd7d0a 100755
--- a/tests/xfs/139
+++ b/tests/xfs/139
@@ -73,9 +73,6 @@ md5sum "$testdir/file1" | _filter_scratch
 md5sum "$testdir/file2" | _filter_scratch
 #filefrag -v "$testdir/file1" "$testdir/file2"
 
-echo "Check scratch fs"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/xfs/139.out b/tests/xfs/139.out
index 090e3af8..dc6a31ec 100644
--- a/tests/xfs/139.out
+++ b/tests/xfs/139.out
@@ -5,4 +5,3 @@ CoW every other block
 Compare files
 673c759fb131ccf3336c4f8c549a497e  SCRATCH_MNT/test-139/file1
 dc802351f6717547cbf4c951b294f952  SCRATCH_MNT/test-139/file2
-Check scratch fs
diff --git a/tests/xfs/140 b/tests/xfs/140
index 309b2842..a379ca79 100644
--- a/tests/xfs/140
+++ b/tests/xfs/140
@@ -80,9 +80,6 @@ echo "Compare files"
 ! cmp -s "$testdir/file1" "$testdir/file2" || echo "file1 and file2 must not match"
 cmp -s "$testdir/file2" "$testdir/file2.chk" || echo "file2 and file2.chk do not match"
 
-echo "Check scratch fs"
-umount "$SCRATCH_MNT"
-
 # success, all done
 status=0
 exit
diff --git a/tests/xfs/140.out b/tests/xfs/140.out
index 5d00ea26..4d9e6a1a 100644
--- a/tests/xfs/140.out
+++ b/tests/xfs/140.out
@@ -4,4 +4,3 @@ Create the original files
 Compare files
 CoW every other block
 Compare files
-Check scratch fs