b=18623

i=Andrew.Perepechko
lfs df several mount points fix

diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index 9ae86ae..71dc57d 100644 (file)
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -37,7 +37,7 @@ SUBSYSTEM=${SUBSYSTEM:- 0xffb7e3ff}
 L_GETGROUPS=${L_GETGROUPS:-`do_facet mds which l_getgroups || echo`}
 
 ENABLE_QUOTA=${ENABLE_QUOTA:-""}
-QUOTA_TYPE=${QUOTA_TYPE:-"ug"}
+QUOTA_TYPE=${QUOTA_TYPE:-"ug3"}
 QUOTA_USERS=${QUOTA_USERS:-"quota_usr quota_2usr sanityusr sanityusr1"}
 
 MKFSOPT=""

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index a31de32..191641c 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -405,11 +405,11 @@ setup_quota(){
     local quota_usrs=$QUOTA_USERS
 
     # get_filesystem_size
-    local disksz=$(lfs df | grep "filesystem summary:"  | awk '{print $3}')
+    local disksz=$(lfs df $mntpt | grep "filesystem summary:"  | awk '{print $3}')
     local blk_soft=$((disksz + 1024))
     local blk_hard=$((blk_soft + blk_soft / 20)) # Go 5% over
 
-    local Inodes=$(lfs df -i | grep "filesystem summary:"  | awk '{print $3}')
+    local Inodes=$(lfs df -i $mntpt | grep "filesystem summary:"  | awk '{print $3}')
     local i_soft=$Inodes
     local i_hard=$((i_soft + i_soft / 20))