X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Flmv.sh;h=a402665ad4a768d4600183221e49e268aeb12a5d;hp=f2ebf52adc335676d8d7e66cd9742cc1d31c4be6;hb=031a68539c69c90d522758cb5d382a0c0e86188a;hpb=d88f33617c6eae5397c2f876326c0cdd73ef9376

diff --git a/lustre/tests/lmv.sh b/lustre/tests/lmv.sh
index f2ebf52..a402665 100755
--- a/lustre/tests/lmv.sh
+++ b/lustre/tests/lmv.sh
@@ -10,13 +10,17 @@ LMC=${LMC:-lmc}
 TMP=${TMP:-/tmp}
 
 MDSSIZE=${MDSSIZE:-100000}
-FSTYPE=${FSTYPE:-ext3}
 MDSCOUNT=${MDSCOUNT:-3}
-
 OSTDEV=${OSTDEV:-$TMP/ost1-`hostname`}
 OSTSIZE=${OSTSIZE:-200000}
 OSTCOUNT=${OSTCOUNT:-1}
 
+DEF_FSTYPE=`test "x$(uname -r | grep -o '2.6')" = "x2.6" && echo "ldiskfs" || echo "ext3"`
+FSTYPE=${FSTYPE:-$DEF_FSTYPE}
+#used only if FSTYPE == smfs, otherwise ignored by lconf
+MDS_BACKFSTYPE=${MDS_BACKFSTYPE:-$DEF_FSTYPE}
+OST_BACKFSTYPE=${OST_BACKFSTYPE:-$DEF_FSTYPE}
+
 # 1 to config an echo client instead of llite
 ECHO_CLIENT=${ECHO_CLIENT:-}
 
@@ -34,7 +38,8 @@ rm -f $config
 
 # create nodes
 ${LMC} -m $config --add node --node localhost || exit 10
-${LMC} -m $config --add net --node localhost --nid localhost --nettype tcp || exit 11
+${LMC} -m $config --add net --node client --nid '*' --nettype tcp || exit 12
+${LMC} -m $config --add net --node localhost --nid `hostname` --nettype tcp || exit 11
 
 # configure mds server
 ${LMC} -m $config --add lmv --lmv lmv1 || exit 12
@@ -42,7 +47,8 @@ ${LMC} -m $config --add lmv --lmv lmv1 || exit 12
 for num in `seq $MDSCOUNT`; do
     MDSDEV=$TMP/mds${num}-`hostname`
     ${LMC} -m $config --format --add mds --node localhost --mds mds${num} \
-        --lmv lmv1 --fstype $FSTYPE --dev $MDSDEV --size $MDSSIZE || exit 13
+        --lmv lmv1 --fstype $FSTYPE --backfstype $MDS_BACKFSTYPE --dev $MDSDEV \
+        --size $MDSSIZE || exit 13
 done
 
 ${LMC} -m $config --add lov --lov lov1 --lmv lmv1 --stripe_sz $STRIPE_BYTES --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 20
@@ -52,7 +58,7 @@ for num in `seq $OSTCOUNT`; do
     OST=ost$num
     DEVPTR=OSTDEV$num
     eval $DEVPTR=${!DEVPTR:=$TMP/$OST-`hostname`}
-    ${LMC} -m $config --add ost --node localhost --lov lov1 --ost $OST --fstype $FSTYPE --dev ${!DEVPTR} --size $OSTSIZE $JARG || exit 30
+    ${LMC} -m $config --add ost --node localhost --lov lov1 --ost $OST --fstype $FSTYPE --backfstype $OST_BACKFSTYPE --dev ${!DEVPTR} --size $OSTSIZE $JARG || exit 30
 done
 
-${LMC} -m $config --add mtpt --node localhost --path $MOUNT --lmv lmv1 --lov lov1 || exit 40
+${LMC} -m $config --add mtpt --node localhost --path $MOUNT --mds lmv1 --lov lov1 || exit 40