remove duplicate umount $scratch_dev in various tests

_require_scratch unmounts the SCRATCH_DEV. So it is not necessery
to do it explicitly at the first time.

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/232 b/232
index fb4a8727c52e09a9c028a3502a38dedf078d9161..2795da7bbfb32d9dd9f9b5327412b0e208ddbbca 100755 (executable)
--- a/232
+++ b/232
@@ -72,7 +72,6 @@ _require_scratch
 _require_quota
 _need_to_be_root
 
-umount $SCRATCH_DEV 2>/dev/null
 _scratch_mkfs >> $seq.full 2>&1
 _scratch_mount "-o usrquota,grpquota"
 chmod 777 $SCRATCH_MNT

diff --git a/233 b/233
index e6ba7efda9396fe9c42fc354c4b7a0dcc60f04ec..28e6ac79b3efc05395e1239d4d839dac071b7a72 100755 (executable)
--- a/233
+++ b/233
@@ -80,7 +80,6 @@ _require_quota
 _require_user
 _need_to_be_root
 
-umount $SCRATCH_DEV 2>/dev/null
 _scratch_mkfs >> $seq.full 2>&1
 _scratch_mount "-o usrquota,grpquota"
 chmod 777 $SCRATCH_MNT

diff --git a/269 b/269
index 206492b5314c7f047d7836c8b057d358ac003d95..7e13ed99c71ab0774ae571bd63c05dbf095e35f9 100755 (executable)
--- a/269
+++ b/269
@@ -64,10 +64,9 @@ _workout()
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
-_require_scratch
 _need_to_be_root
+_require_scratch
 
-umount $SCRATCH_DEV 2>/dev/null
 _scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seq.full 2>&1
 _scratch_mount
 

diff --git a/270 b/270
index 29700fb024c8df9c01f3c3681f4cdb5bb143e7ab..b9ada27c349cbeac8cf3567d9305f8801b1505ec 100755 (executable)
--- a/270
+++ b/270
@@ -77,12 +77,11 @@ _workout()
 # real QA test starts here
 _supported_fs generic
 _supported_os Linux
-_require_scratch
 _require_quota
 _require_user
 _need_to_be_root
+_require_scratch
 
-umount $SCRATCH_DEV 2>/dev/null
 _scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seq.full 2>&1
 _scratch_mount "-o usrquota,grpquota"
 chmod 777 $SCRATCH_MNT

diff --git a/271 b/271
index b4e60430e24639fe100ddce9f0ac9d4f4254df2f..58a7f9164e0e2ad29e4ff01ae08b9e7c3232cd1d 100755 (executable)
--- a/271
+++ b/271
@@ -39,10 +39,9 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 # real QA test starts here
 _supported_fs ext4
 _supported_os Linux
-_require_scratch
 _need_to_be_root
+_require_scratch
 
-umount $SCRATCH_DEV 2>/dev/null
 _scratch_mkfs_sized $((128 * 1024 * 1024)) >> $seq.full 2>&1
 
 # -onoload and EXT4_SYNC_FL on file is important becase result in

diff --git a/272 b/272
index a35ef83be9eb69e34d7f023fa91865a5ec5642da..26dfa3b8c63a07e80bd8f39766ceab103e6802fd 100755 (executable)
--- a/272
+++ b/272
@@ -83,10 +83,9 @@ chattr_opt: $chattr_opt"
 # real QA test starts here
 _supported_fs ext3 ext4
 _supported_os Linux
-_require_scratch
 _need_to_be_root
+_require_scratch
 
-umount $SCRATCH_DEV 2>/dev/null
 _scratch_mkfs_sized $((64 * 1024 * 1024)) >> $seq.full 2>&1
 _scratch_mount