]> git.apps.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
reflink: remove redundant filesystem checks from the end of the tests
authorDarrick J. Wong <darrick.wong@oracle.com>
Tue, 2 Feb 2016 01:57:11 +0000 (17:57 -0800)
committerDarrick J. Wong <darrick.wong@oracle.com>
Fri, 12 Feb 2016 17:39:04 +0000 (09:39 -0800)
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>
51 files changed:
tests/generic/157
tests/generic/158
tests/generic/161
tests/generic/162
tests/generic/163
tests/generic/164
tests/generic/165
tests/generic/166
tests/generic/167
tests/generic/168
tests/generic/170
tests/generic/171
tests/generic/172
tests/generic/173
tests/generic/174
tests/generic/175
tests/generic/176
tests/generic/183
tests/generic/185
tests/generic/186
tests/generic/187
tests/generic/188
tests/generic/189
tests/generic/190
tests/generic/191
tests/generic/194
tests/generic/195
tests/generic/196
tests/generic/197
tests/generic/199
tests/generic/200
tests/generic/201
tests/generic/202
tests/generic/203
tests/generic/205
tests/generic/206
tests/generic/216
tests/generic/217
tests/generic/218
tests/generic/220
tests/generic/222
tests/generic/227
tests/generic/229
tests/generic/238
tests/generic/242
tests/generic/243
tests/xfs/127
tests/xfs/128
tests/xfs/131
tests/xfs/139
tests/xfs/140

index 0150866144aa906fbaed09cc6d898ad049008f10..74314d8851077099a1ff9a97ba8a94360ac4db65 100755 (executable)
@@ -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
index 807c247fd93097610e47cfc40fba6e57e52c31f8..779d55eaca785b1eb8f1e561f9a218ea5d889aaa 100755 (executable)
@@ -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
index 7fb89632e9a14e9359ca31be67fe48a2045ba51a..b271936ab9f1a89685bfe99e4f67dc740a3e3aea 100755 (executable)
@@ -71,7 +71,6 @@ wait
 
 echo "Check fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 echo "Done"
 # success, all done
index 2fb947a05780ccc4774810109ccc0e4cd79bf982..30c761be9960fbeb4158a05bd3f0a99116201de2 100755 (executable)
@@ -87,7 +87,6 @@ wait
 
 echo "Check fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 echo "Done"
 # success, all done
index 018644359937c450b93f84b7f9a63ffb6ac18101..f2ea3341dd1a2af730155150143c8a70bbf85f1b 100755 (executable)
@@ -87,7 +87,6 @@ wait
 
 echo "Check fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 echo "Done"
 # success, all done
index 087c6ba03025aaa1733376be0c8f65f9b798bda6..e97ac131640ad7a5f443094850d04212196df56e 100755 (executable)
@@ -97,7 +97,6 @@ wait
 
 echo "Check fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 echo "Done"
 # success, all done
index 6bd15e17142a5f93bd5c85c41827a376010daf5d..b30507957700bedb87714548a878d8d05717879b 100755 (executable)
@@ -97,7 +97,6 @@ wait
 
 echo "Check fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 echo "Done"
 # success, all done
index 6cfb82119dc50fb795ce20372d4b79246a7beba8..2c2ff4ecfaf7d45100b582136c3fc5ba306c484b 100755 (executable)
@@ -84,7 +84,6 @@ wait
 
 echo "Check for damage"
 _scratch_unmount
-_check_scratch_fs
 
 echo "Done"
 
index fc5a86c06d702a898ec8509c2cf188dfc09c1175..b80b4814458cca019b29ea107d627f44a4abf6a3 100755 (executable)
@@ -84,7 +84,6 @@ wait
 
 echo "Check for damage"
 _scratch_unmount
-_check_scratch_fs
 
 echo "Done"
 
index ee3848dba41921799cea0e2f31fabbc4c27bd933..0d620da7f4f9926bcc1a73c2e069d4b35997981c 100755 (executable)
@@ -88,7 +88,6 @@ wait
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 echo "Done"
 
index 6d27810716b2e3170043c6ff314d4d7e8b07f88c..78ed63d8d04e0d1f9d07744ff823c10f3dc523bf 100755 (executable)
@@ -88,7 +88,6 @@ wait
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 echo "Done"
 
index ec3729d0c2fbfbb23f8fd4cf3690359d1373b237..4b4f1414635c941c562ffb848fa572a76f3d7136 100755 (executable)
@@ -100,7 +100,6 @@ echo "${out}"
 
 echo "Check scratch fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
index 1988c8d8df80fb81b5fc30fd7aa47f8cadc12b96..98eb97ff492095752e7db6a0f3ac424f3a74bad7 100755 (executable)
@@ -100,7 +100,6 @@ echo "${out}"
 
 echo "Check scratch fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
index 5bb9ce6ef84cc49852effacdb3eb32141c1a5079..e26f5a974be608ed83aab28c67293ba295869def 100755 (executable)
@@ -102,7 +102,6 @@ fi
 
 echo "Check scratch fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
index a8e0bb55ebf31a259a0fd7b34ed29975ae50ed65..1749a1c6f1bbdb5f9eafd826b9f7010eb0de11ee 100755 (executable)
@@ -100,7 +100,6 @@ echo "${out}"
 
 echo "Check scratch fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
index b37ff6606cbb31b954b22569203ef5bbc754e92b..ac2f54f59aa26c627d0002911321ccdbba83491d 100755 (executable)
@@ -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
index 0ca0b177daafc11246637141db315d19c773b2a9..e32f94fea16e6b4aca39c15b0185977041b684c0 100755 (executable)
@@ -74,7 +74,6 @@ done
 
 echo "Check scratch fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
index 8141f38d909530b6f2a1765ee8c16d21b4fc5225..27179fd9e7f7ff10aab627422f32224546f1a638 100755 (executable)
@@ -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
index 1d6dff24e58aa4e956fb5ae6a2a522b593608dc6..368260d892dfafe8103e6a86de3c2ec3b310c8a4 100755 (executable)
@@ -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
index 9aac966516b4253661c218b8086d043a767436c7..67e52b5db3eef3b814a0488e31d6bd0c358289e1 100755 (executable)
@@ -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
index b3f154271afea17a7a7910977f67f99caaea88ba..c9933943f9225ec0b988beb9e228139b8722a07e 100755 (executable)
@@ -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
index c67b847d340ea535c30b31d38bf2f76b6ec6716c..9e633887c1b2c6ddae7649bc35211457095eafdd 100755 (executable)
@@ -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
index 1954235d2dfec25d1a493415ba69d2fd7636be73..661129c2e02bbcfa90d2286621848fef8d34efa9 100755 (executable)
@@ -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
index d3d573b903cdee51b60aef63e858710048d208d4..4e272c2606916077851e1e2477486118496e2291 100755 (executable)
@@ -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
index 8b190845532a79ac4642620c8451e7f3f382be9c..5aadded86c20b1f5973543f1e2be777bd74b9bbc 100755 (executable)
@@ -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
index 1fc2cd7a1259bccf3a9896119d45fcf6f4a5ae36..a17debc0448535336d37b9e7b37ba92745a4a051 100755 (executable)
@@ -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
index 087275cd6d78c0b751282d5eab6f58f3aed13985..f49d0c2443891ea4ee2a434953906f5a45ab0adf 100755 (executable)
@@ -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
index d81523298b572fc6db45828b476180a538d00985..4da9c76dea88a6b05ca6b655eb6cbd36bde893ce 100755 (executable)
@@ -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
index 54005aeb8ed448a5ce0fb5c2d0e456336cd25a87..54ee5ab25980f2b37a15864d5281354329f4826b 100755 (executable)
@@ -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
index eb567e42c1a2afbb538eb6f1e1b4f1ea97f75c74..5e4bca8bf71652395f4d616a331663174a869d46 100755 (executable)
@@ -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
index 991fed024339f020c4fc3f6aece2bfa7c3e9d8b7..f0521ae6b2ba9dde21a15ccf9c1807177ff08ae1 100755 (executable)
@@ -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
index ffc1ce475017b908dcf749e26c8a721496e5b233..db77a5e9121bddd03b54db4d67108e1947895fdd 100755 (executable)
@@ -79,7 +79,6 @@ rm "$testdir/file3"
 
 echo "Check for damage"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
index 375b65f089fd6203c1aca032a273e2855e205f09..91f2d9b15f8a0b881e1e2d43e5b9a309404fea49 100755 (executable)
@@ -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
index 549f2ba649348ed0a283a0ae1aba10182a03e928..86a672b4943788ed701763c61800e3a6fd167e67 100755 (executable)
@@ -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
index 8f0ec450e5b2aa2d6eef9945cc4a2e9ec2878878..8fed95527fd97e299bdbfe331d1c07abd2c65d39 100755 (executable)
@@ -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
index f2c4ecc3672c0199f9b9c774b40f310464cbffb4..10b5285d4e7948c1fcc50cc8afff9afc6926b8a1 100755 (executable)
@@ -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
index 3789cb07b4638d3228d57f02a3c0034ec84b5c5d..671f0c16e7727ddae21b3f4908921294f208198c 100755 (executable)
@@ -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
index 4ae603f1464cf25ef55adb0f70c6e1ad7505da6e..e4d40c739b5b37922aac1d2dadc92976ea61dd48 100755 (executable)
@@ -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
index d63c06f96258d97ed3f6e0150e04c499b0fa840c..eb52fea8a15c67869f686a8b90d0124705cf1f29 100755 (executable)
@@ -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
index ccdb32e824270b59e9919b880f54ee3571b67ec8..fb5ecdae1b9b4c49bfd154553daa74a705ada585 100755 (executable)
@@ -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
index cb5a7881712018518f9503809bb2cfc154aa5703..ab3f65f8ce5082e54bf9fd6aee622c04a909c24d 100755 (executable)
@@ -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
index d2004248bc32edc8eb6b8c018835a238fa761389..387c7140b4f7749add4e393a05adde7d924fb3d6 100755 (executable)
@@ -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
index cdaddafcea08cffcec9abe27814d23925b963300..eb105a328276474e0d02a8ab5cf4613817da0ce3 100755 (executable)
@@ -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
index 98530e080e1d8b98c7d2e10570ee33239bc8709a..02057ad8d0d95f91854e1251caa8a34e549fb45e 100755 (executable)
@@ -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
index a5a17c39770ae8e6b93b2769bfab1e47ac8cf426..3023ac7d3c2ef5d60d6d0999bf74d5a1b04cb111 100755 (executable)
@@ -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
index b7ca466e7c9a23693b239982f376660462a35a45..e65347f6813d615649d107176df18b9d725533f6 100755 (executable)
@@ -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
index c31cd174725556ee0fe78f6b4da84b4c7584ecba..63d5890519fa10d00d335b8de8a3ecd2f20b892c 100755 (executable)
@@ -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
index c9547fbead46379071f49ffcce338dbe7e42a8af..2e1da3fb1bdcc321ad5c1f4c46bcefc3efbf40bc 100755 (executable)
@@ -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
index 8442821200f8e8791b9d4aabfe5e41b8f7300447..adab31f44d930d5cae362c0babb04cafc695b47d 100755 (executable)
@@ -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
index 51c903e5077fb77529c543cd27de561bc1a05fec..feb55bd1a8ced01f9b396335015be85181ee2a3c 100755 (executable)
@@ -75,7 +75,6 @@ md5sum "$testdir/file2" | _filter_scratch
 
 echo "Check scratch fs"
 umount "$SCRATCH_MNT"
-_check_scratch_fs
 
 # success, all done
 status=0
index 133bb72d6cee73c01bf0ad3608dec048b97c2e2f..309b2842f527624c1c474e0326bcf3f862cc363b 100644 (file)
@@ -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