[Ocfs2-test-devel] [PATCH 11/59] ocfs2-test: fix multi exent test in discontig-bg

[Junxiao Bi]

From: Tiger Yang <tiger.yang at oracle.com>

Signed-off-by: Tiger Yang <tiger.yang at oracle.com>
Signed-off-by: Junxiao Bi <junxiao.bi at oracle.com>
---
 .../discontig_bg_test/activate_discontig_bg.sh     |    2 +-
 programs/discontig_bg_test/discontig_runner.sh     |    3 +++
 programs/python_common/o2tf.sh                     |    1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/programs/discontig_bg_test/activate_discontig_bg.sh b/programs/discontig_bg_test/activate_discontig_bg.sh
index 4239190..0bb5482 100755
--- a/programs/discontig_bg_test/activate_discontig_bg.sh
+++ b/programs/discontig_bg_test/activate_discontig_bg.sh
@@ -261,7 +261,7 @@ function f_fillup_volume_almost_full()
 	local -i recs=`f_get_recs_in_eb`
 
 	FILL_CONTIG_IBG_NUM=`f_get_inodes_num_of_contig_bg`
-	FILL_CONTIG_EBG_M=$((${extents}*${recs}*${CLUSTERSIZE}/1024/1024))
+	FILL_CONTIG_EBG_M=$((${extents}*${recs}*${BLOCKSIZE}/1024/1024))
 
 
 	if [ "${TYPE}" == "extent" ];then
diff --git a/programs/discontig_bg_test/discontig_runner.sh b/programs/discontig_bg_test/discontig_runner.sh
index a9e74bd..fa348e8 100755
--- a/programs/discontig_bg_test/discontig_runner.sh
+++ b/programs/discontig_bg_test/discontig_runner.sh
@@ -1015,6 +1015,9 @@ function f_multi_extents_test()
 	RET=$?
 	f_exit_or_not ${RET}
 
+	${RM_BIN} -rf ${MOUNT_POINT}/ocfs2-fillup-contig-bg-dir-*
+	sync
+
 	WORK_PLACE=${MOUNT_POINT}/${WORK_PLACE_DIRENT}
 	${MKDIR_BIN} -p ${WORK_PLACE}
 
diff --git a/programs/python_common/o2tf.sh b/programs/python_common/o2tf.sh
index d912a9b..2f2654b 100755
--- a/programs/python_common/o2tf.sh
+++ b/programs/python_common/o2tf.sh
@@ -28,6 +28,7 @@ export PATH=$PATH:.
 . ./config.sh
 
 MKFS_BIN="`which sudo` -u root `which mkfs.ocfs2`"
+FSCK_BIN="`which sudo` -u root `which fsck.ocfs2`"
 MOUNT_BIN="`which sudo` -u root `which mount`"
 UMOUNT_BIN="`which sudo` -u root `which umount`"
 DEBUGFS_BIN="`which sudo` -u root `which debugfs.ocfs2`"
-- 
1.7.9.5