diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs01.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs01.sh
index f7787c68b61cf2707bd5c5aa6faf407f652d0413..a52c3cfd059ce191077ceba92b32492da46e099b 100644
--- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs01.sh
+++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs01.sh
@@ -35,8 +35,17 @@ do_test()
      local ret=0
 
      tst_res TINFO "Start test discard size >= 512 blocks in life mode."
+
+     undiscard_num=$(cat /proc/fs/f2fs/${DISK_NAME}/undiscard_info |tr -cd "[0-9]")
+     if [ $undiscard_num != "" ] ;then
+          tst_res TPASS "Get undiscard info successfully, number is ${undiscard_num}."
+     else
+          tst_res TFAIL "Get undiscard info failed."
+          ret=$(( $ret + 1 ))
+     fi
+
      cat /sys/kernel/debug/tracing/trace_pipe | grep issue_discard >> log01.txt &
-     mkdir /mnt/f2fs_mount/test1
+     mkdir ${TEST_FILE_PATH}/test1
      if [ $? -eq 0 ]; then
           tst_res TPASS "Created test1 dir successfully."
      else
@@ -46,10 +55,10 @@ do_test()
      local i=0
      while [ $i -lt 30 ]
      do
-          dd if=/dev/zero of=/mnt/f2fs_mount/test1/image$i bs=8M count=1
+          dd if=/dev/zero of=${TEST_FILE_PATH}/test1/image$i bs=8M count=1
           i=$(( $i + 1 ))
      done
-     rm -rf /mnt/f2fs_mount/test1/image*[1,3,5,7,9]
+     rm -rf ${TEST_FILE_PATH}/test1/image*[1,3,5,7,9]
      if [ $? -eq 0 ]; then
           tst_res TPASS "Deleted successfully."
      else
@@ -61,6 +70,7 @@ do_test()
      kill %1
 
      local blklen=$(cat log01.txt | awk 'NR == 1' | awk -F '0x' '{print$3}')
+     echo "[test] blklen is " $blklen
      if [ $((16#$blklen)) -ge 512 ]; then
           tst_res TPASS "blklen >= 512 successfully."
      else
@@ -78,6 +88,7 @@ do_test()
 do_clean()
 {
      rm log01.txt
+     rm -rf ${TEST_FILE_PATH}/test1
      losetup -d /dev/block/loop1
      umount /mnt/f2fs_mount
 }
diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs02.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs02.sh
index 2fd25638240ed1e608e491db9a1fcf5a344414e9..7be7eaee4f3d7754bc1a0333d3badee286a95d9b 100644
--- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs02.sh
+++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs02.sh
@@ -41,7 +41,7 @@ do_test()
     cat /sys/kernel/debug/tracing/trace_pipe | grep issue_discard >> log02.txt &
     sh run_fio.sh > run_fio.txt &
     sleep 60
-    mkdir /mnt/f2fs_mount/test2
+    mkdir ${TEST_FILE_PATH}/test2
     if [ $? -eq 0 ]; then
         tst_res TPASS "Created test2 dir successfully."
     else
@@ -52,10 +52,10 @@ do_test()
     local i=0
     while [ $i -lt 30 ]
     do
-        dd if=/dev/zero of=/mnt/f2fs_mount/test2/image$i bs=8M count=1
+        dd if=/dev/zero of=${TEST_FILE_PATH}/test2/image$i bs=8M count=1
         i=$(( $i + 1 ))
     done
-    rm -rf /mnt/f2fs_mount/test2/image*[1,3,5,7,9]
+    rm -rf ${TEST_FILE_PATH}/test2/image*[1,3,5,7,9]
     if [ $? -eq 0 ]; then
         tst_res TPASS "Deleted successfully."
     else
@@ -102,7 +102,8 @@ do_test()
 
 do_clean()
 {
-    rm -rf log02.txt
+    rm log02.txt
+    rm -rf ${TEST_FILE_PATH}/test2
     losetup -d /dev/block/loop1
     umount /mnt/f2fs_mount
 }
diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs03.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs03.sh
index 88a46e27ffd48780efbc84545dbaffb340617c17..30d4667ac9a65df5a9d61f1ca65875d648b26b74 100644
--- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs03.sh
+++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs03.sh
@@ -38,7 +38,7 @@ do_test()
 
      cat /sys/kernel/debug/tracing/trace_pipe | grep issue_discard >> log03.txt &
      sleep 60
-     mkdir /mnt/f2fs_mount/test3
+     mkdir ${TEST_FILE_PATH}/test3
      if [ $? -eq 0 ]; then
           tst_res TPASS "Creation test3 dir successfully."
      else
@@ -47,12 +47,12 @@ do_test()
      fi
 
      local i=0
-     while [ $i -lt 50 ]
+     while [ $i -lt 500 ]
      do
-          dd if=/dev/zero of=/mnt/f2fs_mount/test3/image$i bs=512K count=1
+          dd if=/dev/zero of=${TEST_FILE_PATH}/test3/image$i bs=512K count=1
           i=$(( $i + 1 ))
      done
-     rm -rf /mnt/f2fs_mount/test3/image*[1,3,5,7,9]
+     rm -rf ${TEST_FILE_PATH}/test3/image*[1,3,5,7,9]
      if [ $? -eq 0 ]; then
           tst_res TPASS "Deleted successfully."
      else
@@ -83,8 +83,10 @@ do_test()
 do_clean()
 {
      rm -rf log03.txt
+     rm -rf ${TEST_FILE_PATH}/equilibrium_state
+     rm -rf ${TEST_FILE_PATH}/test3
      losetup -d /dev/block/loop1
-     umount /mnt/f2fs_mount
+     umount ${TEST_FILE_PATH}
 }
 
 do_setup
diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs05.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs05.sh
index f96724447abd7460bc07edd74baae304bd22249f..5c010bd7703bc0ea9112472a34587bfed1e38c75 100644
--- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs05.sh
+++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs05.sh
@@ -37,7 +37,7 @@ do_test()
      tst_res TINFO "Start test discard size >= 1 block in performance mode."
 
      cat /sys/kernel/debug/tracing/trace_pipe | grep issue_discard >> log05.txt &
-     mkdir /mnt/f2fs_mount/test5
+     mkdir ${TEST_FILE_PATH}/test5
      if [ $? -eq 0 ]; then
           tst_res TPASS "Creation test5 dir successfully."
      else
@@ -45,12 +45,12 @@ do_test()
           ret=$(( $ret + 1 ))
      fi
      local i=0
-     while [ $i -lt 200 ]
+     while [ $i -lt 4096 ]
      do
-          dd if=/dev/zero of=/mnt/f2fs_mount/test5/image$i bs=4k count=1
+          dd if=/dev/zero of=${TEST_FILE_PATH}/test5/image$i bs=4k count=1
           i=$((i+1))
      done
-     rm -rf /mnt/f2fs_mount/test5/image*[1,3,5,7,9]
+     rm -rf ${TEST_FILE_PATH}/test5/image*[1,3,5,7,9]
      if [ $? -eq 0 ]; then
           tst_res TPASS "Delete successfully."
      else
@@ -80,8 +80,10 @@ do_test()
 do_clean()
 {
      rm -rf log05.txt
+     rm -rf ${TEST_FILE_PATH}/test5
+     rm -rf ${TEST_FILE_PATH}/performance_state
      losetup -d /dev/block/loop1
-     umount /mnt/f2fs_mount
+     umount /mnt/f2fs_mount/
 }
 
 do_setup
diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs07.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs07.sh
index e0f9167e2a7a10cc60d2fa0a102a953dd5c435ef..17e863ed3726e89074c600bf140a9f6a753d00b3 100644
--- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs07.sh
+++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs07.sh
@@ -33,7 +33,7 @@ do_setup()
 do_test()
 {
     local ret=0
-    _ssr_path=/sys/fs/f2fs/loop1
+    _ssr_path=/sys/fs/f2fs/${DISK_NAME}
 
     tst_res TINFO "Start test hierarchical SSR control interface."
 
@@ -56,8 +56,8 @@ do_test()
 do_clean()
 {
     echo $temp > $_ssr_path/hc_enable
-    losetup -d /dev/block/loop1 
-    umount /mnt/f2fs_mount
+    losetup -d /dev/block/loop1
+    umount /mnt/f2fs_mount/
 }
 
 do_setup
diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs08.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs08.sh
index fec1882c5a9a3001e8a238519bbd1a3220c1a3a9..9ccfc02afa1e2cfb16feb46bfbe0acc4d35d3d11 100644
--- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs08.sh
+++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs08.sh
@@ -33,7 +33,7 @@ do_setup()
 do_test()
 {
     ret=0
-    _ssr_path=/sys/fs/f2fs/loop1
+    _ssr_path=/sys/fs/f2fs/${DISK_NAME}
 
     tst_res TINFO "Start test hierarchical SSR threshold configuration interface."
 
@@ -70,7 +70,7 @@ do_test()
 
 confirm_value()
 {
-    local result_out1=$(cat /sys/fs/f2fs/loop1/$1)
+    local result_out1=$(cat /sys/fs/f2fs/${DISK_NAME}/$1)
     if [ "$result_out1" == "5242880" ]; then
         tst_res TPASS "$1 is 5242880 expected."
         return 0
@@ -82,7 +82,7 @@ confirm_value()
 
 confirm_change_value()
 {
-    local result_out2=$(cat /sys/fs/f2fs/loop1/$1)
+    local result_out2=$(cat /sys/fs/f2fs/${DISK_NAME}/$1)
     if [ "$result_out2" == "6000000" ]; then
         tst_res TPASS "$1 is 6000000 expected."
     else
diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs09.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs09.sh
index 73d043e7aa456c0a37e39f310a0d2109950e13e7..d2941640ae8064df62fb8bb12ee51b7b1338cff5 100644
--- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs09.sh
+++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs09.sh
@@ -33,7 +33,7 @@ do_setup()
 do_test()
 {
     ret=0
-    _ssr_path=/sys/fs/f2fs/loop1
+    _ssr_path=/sys/fs/f2fs/${DISK_NAME}
 
     tst_res TINFO "Start test hierarchical SSR waterline configuration interface."
 
diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs10.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs10.sh
index 10f8ec3771751bd77183c8084967f9661f831606..2ba01c3237e5317a2ab97b97fa8c4ba1e96a5282 100644
--- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs10.sh
+++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs10.sh
@@ -23,13 +23,20 @@
 
 source tst_oh.sh
 
-do_setup()
+mount_f2fs()
 {
     mkfs.f2fs -d1 -t1 -O quota $IMG_FILE
     losetup /dev/block/loop1 $IMG_FILE
     mount -t f2fs /dev/block/loop1 /mnt/f2fs_mount/
 }
 
+do_setup()
+{
+    if [[ $FS_TYPE != "f2fs" ]] ;then
+        mount_f2fs
+    fi
+}
+
 do_test()
 {
     local ret=0
@@ -37,35 +44,40 @@ do_test()
 
     tst_res TINFO "Start test hierarchical SSR recovery function is enabled."
 
+    local size=$(df -h |grep /dev/block |grep /data |awk -F ' ' '{print $2}' |tr -cd "[0-9]")
+    local used=$(df -h |grep /dev/block |grep /data |awk -F ' ' '{print $3}' |tr -cd "[0-9]|[.]")
+    local ssr_fill_size=$(echo | awk "{print int($size-$used-3)}")
+
+    mkdir ${TEST_FILE_PATH}/ssr
     local i=0
-    while [ $i -lt 32 ]
+    while [ $i -lt $ssr_fill_size ]
     do
-        dd if=/dev/zero of=/mnt/f2fs_mount/image$i bs=512M count=1
+        dd if=/dev/zero of=${TEST_FILE_PATH}/ssr/image$i bs=1G count=1
         i=$(( $i + 1 ))
     done
-    mkdir /mnt/f2fs_mount/test10
+    mkdir ${TEST_FILE_PATH}/test10
     local i=0
-    while [ $i -lt 5120 ]
+    while [ $i -lt 4096 ]
     do
-        dd if=/dev/zero of=/mnt/f2fs_mount/test10/image$i bs=512k count=1
+        dd if=/dev/zero of=${TEST_FILE_PATH}/test10/image$i bs=512k count=1
         i=$(( $i + 1 ))
     done
-    rm -rf /mnt/f2fs_mount/test10/image*[1,3,5,7,9]
+    rm -rf ${TEST_FILE_PATH}/test10/image*[1,3,5,7,9]
 
-    echo 1 > /sys/fs/f2fs/loop1/hc_enable
+    echo 1 > /sys/fs/f2fs/${DISK_NAME}/hc_enable
     echo 1 > $_sys_path/tracing_on
     echo 1 > $_sys_path/events/f2fs/f2fs_grading_ssr_allocate/enable
 
     cat $_sys_path/trace_pipe | grep ssr >> log10.txt &
 
-    mkdir /mnt/f2fs_mount/test10/f2fs_grading_ssr_allocate
+    mkdir ${TEST_FILE_PATH}/test10/f2fs_grading_ssr_allocate
     local i=0
-    while [ $i -lt 200 ]
+    while [ $i -lt 2000 ]
     do
-        dd if=/dev/zero of=/mnt/f2fs_mount/test10/f2fs_grading_ssr_allocate/image$i bs=4k count=1
+        dd if=/dev/zero of=${TEST_FILE_PATH}/test10/f2fs_grading_ssr_allocate/image$i bs=4k count=1
         i=$(($i + 1))
     done
-    rm -rf /mnt/f2fs_mount/test10/f2fs_grading_ssr_allocate/image*[1,3,5,7,9]
+    rm -rf ${TEST_FILE_PATH}/test10/f2fs_grading_ssr_allocate/image*[1,3,5,7,9]
 
     sleep 180
     kill %1
@@ -86,7 +98,9 @@ do_test()
 
 do_clean()
 {
-    rm -rf log10.txt
+    rm -r log10.txt
+    rm -r ${TEST_FILE_PATH}/test10
+    rm -r ${TEST_FILE_PATH}/ssr
     losetup -d /dev/block/loop1
     umount /mnt/f2fs_mount
 }
diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs11.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs11.sh
index 9c894227895bad3720e500100b3cf79805fb7e98..172a9b0feac8b37d8b44df13ee56e295f3988c62 100644
--- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs11.sh
+++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs11.sh
@@ -36,35 +36,41 @@ do_test()
     local _sys_path=/sys/kernel/debug/tracing
 
     tst_res TINFO "Start test hierarchical SSR recycling is disabled."
+
+    local size=$(df -h |grep data |grep /dev/block |awk -F ' ' '{print$2}' |tr -cd "[0-9]|[.]")
+    local used=$(df -h |grep data |grep /dev/block |awk -F ' ' '{print$3}' |tr -cd "[0-9]|[.]")
+    local ssr_fill_size=$(echo | awk "{print int(($size-$used-3)}")
+
+    mkdir ${TEST_FILE_PATH}/ssr/
     local i=0
-    while [ $i -lt 32 ]
+    while [ $i -lt $ssr_fill_size ]
     do
-        dd if=/dev/zero of=/mnt/f2fs_mount/image$i bs=512M count=1
+        dd if=/dev/zero of=${TEST_FILE_PATH}/ssr/image$i bs=512M count=1
         i=$(( $i+ 1 ))
     done
 
-    mkdir /mnt/f2fs_mount/test11
+    mkdir ${TEST_FILE_PATH}/test11
     local i=0
-    while [ $i -lt 5120 ]
+    while [ $i -lt 4096 ]
     do
-        dd if=/dev/zero of=/mnt/f2fs_mount/test11/image$i bs=512k count=1
+        dd if=/dev/zero of=${TEST_FILE_PATH}/test11/image$i bs=512k count=1
         i=$(( $i + 1 ))
     done
-    rm -rf /mnt/f2fs_mount/test11/image*[1,3,5,7,9]
+    rm -rf ${TEST_FILE_PATH}/test11/image*[1,3,5,7,9]
 
-    echo 0 > /sys/fs/f2fs/loop1/hc_enable
+    echo 0 > /sys/fs/f2fs/${DISK_NAME}/hc_enable
     echo 1 > $_sys_path/tracing_on
     echo 1 > $_sys_path/events/f2fs/f2fs_grading_ssr_allocate/enable
 
     cat $_sys_path/trace_pipe | grep ssr >> log11.txt &
-    mkdir /mnt/f2fs_mount/test11/f2fs_grading_ssr_allocate
+    mkdir ${TEST_FILE_PATH}/test11/f2fs_grading_ssr_allocate
     local i=0
-    while [ $i -lt 200 ]
+    while [ $i -lt 1000 ]
     do
-        dd if=/dev/zero of=/mnt/f2fs_mount/test11/f2fs_grading_ssr_allocate/image$i bs=4k count=1
+        dd if=/dev/zero of=${TEST_FILE_PATH}/test11/f2fs_grading_ssr_allocate/image$i bs=4k count=1
         i=$(( $i + 1 ))
     done
-    rm -rf /mnt/f2fs_mount/test11/f2fs_grading_ssr_allocate/image*[1,3,5,7,9]
+    rm -rf ${TEST_FILE_PATH}/test11/f2fs_grading_ssr_allocate/image*[1,3,5,7,9]
 
     sleep 180
     kill %1
@@ -86,8 +92,10 @@ do_test()
 do_clean()
 {
     rm -rf log11.txt
+    rm -rf ${TEST_FILE_PATH}/ssr
+    rm -rf ${TEST_FILE_PATH}/test11
     losetup -d /dev/block/loop1
-    umount /mnt/f2fs_mount
+    umount /mnt/f2fs_mount/
 }
 
 do_setup
diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs12.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs12.sh
index f80ab28dd8608c0320732fa964f3ef4bc59a2f1f..57d28112ff5ac374cc5a918d1e0915680054655e 100644
--- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs12.sh
+++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/enhancedf2fs12.sh
@@ -34,7 +34,7 @@ do_test()
 {
     local ret=0
     local _sys_path=/sys/kernel/debug/tracing
-    temp=$(cat /sys/fs/f2fs/loop1/gc_urgent)
+    temp=$(cat /sys/fs/f2fs/${DISK_NAME}/gc_urgent)
 
     tst_res TINFO "Start test GC function."
 
@@ -43,14 +43,15 @@ do_test()
 
     cat $_sys_path/trace_pipe | grep f2fs_background_gc >> log12.txt &
     local i=0
+    mkdir ${TEST_FILE_PATH}/test12
     while [ $i -lt 512 ]
     do
-        dd if=/dev/zero of=/mnt/f2fs_mount/image$i bs=1M count=1
+        dd if=/dev/zero of=${TEST_FILE_PATH}/test12/image$i bs=1M count=1
         i=$(( $i + 1 ))
     done
-    rm -rf /mnt/f2fs_mount/image*[1,3,5,7,9]
+    rm -rf ${TEST_FILE_PATH}/test12/image*[1,3,5,7,9]
 
-    echo 1 > /sys/fs/f2fs/loop1/gc_urgent
+    echo 1 > /sys/fs/f2fs/${DISK_NAME}/gc_urgent
 
     sleep 60
     kill %1
@@ -71,9 +72,10 @@ do_test()
 do_clean()
 {
     rm -rf log12.txt
-    echo $temp > /sys/fs/f2fs/loop1/gc_urgent
-    losetup -d /dev/block/loop1 
-    umount /mnt/f2fs_mount
+    rm -rf ${TEST_FILE_PATH}/test12
+    echo $temp > /sys/fs/f2fs/${DISK_NAME}/gc_urgent
+    losetup -d /dev/block/loop1
+    umount /mnt/f2fs_mount/
 }
 
 do_setup
diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/equilibrium_init.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/equilibrium_init.sh
index 095cd8bb49a54ac1b9782b64c492b9556d69b1c4..8a7d5da00efde3b81d17875a417b4a6804e67ffd 100644
--- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/equilibrium_init.sh
+++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/equilibrium_init.sh
@@ -23,13 +23,20 @@
 
 source tst_oh.sh
 
-state_init()
+mount_f2fs()
 {
     mkfs.f2fs -d1 -t1 -O quota $IMG_FILE
     losetup /dev/block/loop1 $IMG_FILE
     mount -t f2fs /dev/block/loop1 /mnt/f2fs_mount/
 }
 
+state_init()
+{
+    if [[ $FS_TYPE != "f2fs" ]] ;then
+        mount_f2fs
+    fi
+}
+
 equilibrium_init()
 {
     local ret=0
@@ -38,15 +45,21 @@ equilibrium_init()
     tst_res TINFO "Start equilibrium_init.sh."
     local a=$(cat $segs_path | grep segs | awk -F ' ' '{print$3}')
 
+    local size=$(df -h |grep data |grep /dev/block |awk -F ' ' '{print$2}' |tr -cd "[0-9]|[.]")
+    local used=$(df -h |grep data |grep /dev/block |awk -F ' ' '{print$3}' |tr -cd "[0-9]|[.]")
+    local equilibrium=$(echo |awk "{print int(($size-$used)*0.82*2)}")
+
+    mkdir ${TEST_FILE_PATH}/equilibrium_state
+
     local i=0
-    while [ $i -lt 32 ]
+    while [ $i -lt $equilibrium ]
     do
-        dd if=/dev/zero of=/mnt/f2fs_mount/image$i bs=512M count=1
+        dd if=/dev/zero of=${TEST_FILE_PATH}/equilibrium_state/image$i bs=512M count=1
         i=$(( $i + 1 ))
     done
 
     local b=$(cat $segs_path | grep "valid blocks" | awk -F ' ' '{print$3}' | tr -cd "[0-9]")
-    local result_left=$(echo | awk "{peint $a*512*0.2}")
+    local result_left=$(echo | awk "{print $a*512*0.2}")
     local result_might=$(echo | awk "{print $a*512-$b}")
     local result_right=$(echo | awk "{print $a*512*0.1}")
     local result1=$(echo "$result_left $result_might"  \
@@ -60,8 +73,8 @@ equilibrium_init()
         ret=$(( $ret + 1 ))
     fi
 
-    sleep 60
-    if [ $(cat /sys/fs/f2fs/loop1/discard_type) == '1' ];then
+    sleep 30
+    if [ $(cat /sys/fs/f2fs/${DISK_NAME}/discard_type) == '1' ];then
         tst_res TPASS "equilibrium model successfully."
     else
         tst_res TFAIL "equilibrium model failed."
diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/life_init.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/life_init.sh
index 72ce03ae99e22dd35dc852ad3ce49acd4f71472c..420c2e69eff7508ab84720d565ac29093386b0fc 100644
--- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/life_init.sh
+++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/life_init.sh
@@ -23,13 +23,20 @@
 
 source tst_oh.sh
 
-state_init()
+mount_f2fs()
 {
     mkfs.f2fs -d1 -t1 -O quota $IMG_FILE
     losetup /dev/block/loop1 $IMG_FILE
     mount -t f2fs /dev/block/loop1 /mnt/f2fs_mount/
 }
 
+state_init()
+{
+    if [[ $FS_TYPE != "f2fs" ]] ;then
+        mount_f2fs
+    fi
+}
+
 life_init()
 {
     local ret=0
@@ -51,7 +58,7 @@ life_init()
         ret=$(( $ret + 1 ))
     fi
 
-    if [ $(cat /sys/fs/f2fs/loop1/discard_type) == '0' ];then
+    if [ $(cat /sys/fs/f2fs/${DISK_NAME}/discard_type) == '0' ];then
         tst_res TPASS "life model successfully."
     else
         tst_res TFAIL "life model failed."
diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/performance_init.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/performance_init.sh
index 841d136e84966d15de41da18852847c606192ba5..acdc33fe8ecbcca592a01f5195f0d35c15bd0364 100644
--- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/performance_init.sh
+++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/performance_init.sh
@@ -38,10 +38,17 @@ performance_init()
     tst_res TINFO "Start performance_init.sh."
     local a=$(cat $segs_path | grep segs | awk -F ' ' '{print$3}')
     echo "start Embedded file system $(date +%Y%m%d%H%M%S)...." >> log06.txt
+
+    local size=$(df -h |grep data |grep /dev/block |awk -F ' ' '{print$2}' |tr -cd "[0-9]|[.]")
+    local used=$(df -h |grep data |grep /dev/block |awk -F ' ' '{print$3}' |tr -cd "[0-9]|[.]")
+    local performance=$(echo |awk "{print int(($size-$used)*0.92*2)}")
+
+    mkdir ${TEST_FILE_PATH}/performance_state
+
     local i=0
-    while [ $i -lt 37 ]
+    while [ $i -lt $performance ]
     do
-        dd if=/dev/zero of=/mnt/f2fs_mount/image$i bs=512M count=1
+        dd if=/dev/zero of=${TEST_FILE_PATH}/performance_state/image$i bs=512M count=1
         i=$(( $i + 1 ))
     done
     echo "end Embedded file system $(date +%Y%m%d%H%M%S)...." >> log06.txt
@@ -57,14 +64,14 @@ performance_init()
         ret=$(( $ret + 1 ))
     fi
 
-    sleep 60
-    if [ $(cat /sys/fs/f2fs/loop1/discard_type) == '2' ];then
+    sleep 30
+    if [ $(cat /sys/fs/f2fs/${DISK_NAME}/discard_type) == '2' ];then
         tst_res TPASS "performance model successfully."
     else
         tst_res TFAIL "performance model failed."
         ret=$(( $ret + 1 ))
     fi
-    echo 1 > /sys/kernel/debug/tracing/tracing_on 
+    echo 1 > /sys/kernel/debug/tracing/tracing_on
     echo 1 > /sys/kernel/debug/tracing/events/f2fs/f2fs_issue_discard/enable
     if [ $? -eq 0 ]; then
         tst_res TPASS "Trace opened successfully."
diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/run_fio.sh b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/run_fio.sh
index a9b355f5a93c9e6fff7cd75ebb6f1ec06d2fe242..3f4ee57e5c6bdda3f3eceed73c6fc66987c7d2e3 100644
--- a/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/run_fio.sh
+++ b/test/moduletest/runtest/bin/enhancedf2fs_t/testcases/bin/run_fio.sh
@@ -23,9 +23,9 @@
 
 run_fio()
 {
-    ./fio --name=rw_bg --numjobs=1 --filename=/mnt/f2fs_mount/fio-test.file  \
+    fio --name=rw_bg --numjobs=1 --filename=${TEST_FILE_PATH}/fio-test.file  \
      --bs=32768K --rw=read --ioengine=psync --refill_buffers --group_reporting  \
-     --runtime=360 --time_based --filesize=128M     
+     --runtime=360 --time_based --filesize=128M
 }
 
 run_fio
\ No newline at end of file
diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t_init.sh b/test/moduletest/runtest/bin/enhancedf2fs_t_init.sh
index 0886d840c44b5278b21d7f56b54dddb13415578c..65d569b54309d5557cd7223312bcff8abdc0898b 100644
--- a/test/moduletest/runtest/bin/enhancedf2fs_t_init.sh
+++ b/test/moduletest/runtest/bin/enhancedf2fs_t_init.sh
@@ -22,17 +22,36 @@
 ################################################################################
 export IMG_FILE=/data/image_f2fs
 
+param_get()
+{
+	export DISK_NAME=`df -h |grep /dev/block |grep /data |awk '{print $1}' |cut -d "/" -f4`
+	export FS_TYPE=`mount |grep "/data "|awk '{print $5}'`
+
+	echo "diskname is " $DISK_NAME
+	echo "fs type is " $FS_TYPE
+
+	if [[ $FS_TYPE == "f2fs" ]] ;then
+		export TEST_FILE_PATH=/data/enchancef2fs_test/
+	else
+		export TEST_FILE_PATH=/mnt/f2fs_mount/
+	fi
+}
+
+
 create_catalogue()
 {
-    mkdir /mnt/f2fs_mount/
+    mkdir $TEST_FILE_PATH
 }
 
-enable_init()
+make_image()
 {
     dd if=/dev/zero of=$IMG_FILE bs=1M count=20480
 }
 
 echo "***************************ENHANCED INIT START***************************"
+param_get
 create_catalogue
-enable_init
+if [[ $FS_TYPE != "f2fs" ]] ;then
+	make_image
+fi
 echo "***************************ENHANCED INIT END*****************************"
diff --git a/test/moduletest/runtest/bin/enhancedf2fs_t_uninit.sh b/test/moduletest/runtest/bin/enhancedf2fs_t_uninit.sh
index 5602e4db71880d29a722fa49918a344e1f48f098..22e676092c4b0448e23a0fab79438d49e4529555 100644
--- a/test/moduletest/runtest/bin/enhancedf2fs_t_uninit.sh
+++ b/test/moduletest/runtest/bin/enhancedf2fs_t_uninit.sh
@@ -23,8 +23,7 @@
 
 delete_catalogue()
 {
-    rm /mnt/f2fs_mount/*
-    rmdir /mnt/f2fs_mount
+    rm -r $TEST_FILE_PATH
 }
 
 echo "***************************enhanced UNINIT START**************************"