From 7626c8534176c96013b380843a0940044b18d6eb Mon Sep 17 00:00:00 2001 From: Amir Goldstein Date: Tue, 28 Feb 2017 14:18:33 +0200 Subject: [PATCH] generic/064: access SCRATCH_MNT after _scratch_mount Test is calling _get_block_size $SCRATCH_MNT before _scratch_mount. This results in block size of the wrong fs and a failure with overlay base fs setup. Signed-off-by: Amir Goldstein Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- tests/generic/064 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/generic/064 b/tests/generic/064 index 8cd31b3c..156485ee 100755 --- a/tests/generic/064 +++ b/tests/generic/064 @@ -46,14 +46,16 @@ _require_scratch _require_xfs_io_command "fiemap" _require_xfs_io_command "finsert" _require_xfs_io_command "fcollapse" -src=$SCRATCH_MNT/testfile -dest=$SCRATCH_MNT/testfile.dest -BLOCKS=100 -BSIZE=`_get_block_size $SCRATCH_MNT` + rm -f $seqres.full _scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount || _fail "mount failed" + +src=$SCRATCH_MNT/testfile +dest=$SCRATCH_MNT/testfile.dest +BLOCKS=100 +BSIZE=`_get_block_size $SCRATCH_MNT` length=$(($BLOCKS * $BSIZE)) # Write file -- 2.39.5