_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@xxxxxxxxxx> --- 232 | 1 - 233 | 1 - 269 | 3 +-- 270 | 3 +-- 271 | 3 +-- 272 | 3 +-- 6 files changed, 4 insertions(+), 10 deletions(-) diff --git a/232 b/232 index fb4a872..2795da7 100755 --- 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 e6ba7ef..28e6ac7 100755 --- 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 206492b..7e13ed9 100755 --- 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 e45029f..6a349b4 100755 --- a/270 +++ b/270 @@ -74,12 +74,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 b4e6043..58a7f91 100755 --- 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 a35ef83..26dfa3b 100755 --- 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 -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
