Update older ll*.sh scripts to use helper functions.

diff --git a/lustre/tests/lllocalmount.sh b/lustre/tests/lllocalmount.sh
index 35066cf..f60c7e7 100755 (executable)
--- a/lustre/tests/lllocalmount.sh
+++ b/lustre/tests/lllocalmount.sh
@@ -3,41 +3,24 @@
 SRCDIR="`dirname $0`"
 . $SRCDIR/common.sh
 
-mknod /dev/portals c 10 240
+setup
 
-insmod $R/usr/src/portals/linux/oslib/portals.o
-insmod $R/usr/src/portals/linux/socknal/ksocknal.o
+new_fs ext2 /tmp/ost 10000
+OST=${LOOPDEV}
 
-$R/usr/src/portals/linux/utils/acceptor 1234 &
+MDSFS=ext2
+new_fs ${MDSFS} /tmp/mds 10000
+MDS=${LOOPDEV}
 
-insmod $R/usr/src/obd/rpc/ptlrpc.o
-insmod $R/usr/src/obd/class/obdclass.o 
-insmod $R/usr/src/obd/ext2obd/obdext2.o
-insmod $R/usr/src/obd/ost/ost.o
-insmod $R/usr/src/obd/osc/osc.o
-insmod $R/usr/src/obd/mds/mds.o
-insmod $R/usr/src/obd/mdc/mdc.o
-insmod $R/usr/src/obd/llight/llight.o
+echo 0xffffffff > /proc/sys/portals/debug
 
-dd if=/dev/zero of=/tmp/ost bs=1024 count=10000
-mke2fs -b 4096 -F /tmp/ost
-losetup ${LOOP}0 /tmp/ost
-
-dd if=/dev/zero of=/tmp/mds bs=1024 count=10000
-mke2fs -b 4096 -F /tmp/mds
-losetup ${LOOP}1 /tmp/mds
-
-mknod /dev/obd c 10 241
-echo 8291 > /proc/sys/obd/debug
-echo 8291 > /proc/sys/obd/trace
-
-$R/usr/src/obd/utils/obdctl <<EOF
+$OBDCTL <<EOF
 device 0
 attach mds
-setup ${LOOP}1 ext2
+setup ${MDS} ${MDSFS}
 device 1
 attach obdext2
-setup ${LOOP}0
+setup ${OST}
 device 2
 attach ost
 setup 1
@@ -47,5 +30,4 @@ setup 2
 quit
 EOF
 
-mkdir /mnt/obd
 # mount -t lustre_light -o device=3 none /mnt/obd

diff --git a/lustre/tests/llmount-client.sh b/lustre/tests/llmount-client.sh
index 6fa09c5..4c07611 100644 (file)
--- a/lustre/tests/llmount-client.sh
+++ b/lustre/tests/llmount-client.sh
@@ -12,7 +12,7 @@ insmod $R/usr/src/portals/linux/oslib/portals.o
 # insmod $R/usr/src/portals/linux/socknal/ksocknal.o
 insmod $R/usr/src/portals/linux/qswnal/kqswnal.o
 
-$R/usr/src/portals/linux/utils/ptlctl <<EOF
+$PTLCTL <<EOF
 mynid
 setup elan 
 connect 5
@@ -29,16 +29,15 @@ insmod $R/usr/src/obd/mds/mds.o
 insmod $R/usr/src/obd/mdc/mdc.o
 insmod $R/usr/src/obd/llight/llight.o
 
-dd if=/dev/zero of=/tmp/ost bs=1024 count=10000
-mke2fs -b 4096 -F /tmp/ost
-losetup ${LOOP}0 /tmp/ost
+tmp_fs ext2 /tmp/ost 10000
+OST=${LOOPDEV}
 
 mknod /dev/obd c 10 241
 
-$R/usr/src/obd/utils/obdctl <<EOF
+$OBDCTL <<EOF
 device 1
 attach obdext2
-setup ${LOOP}0
+setup ${OST}
 device 2
 attach ost
 setup 1

diff --git a/lustre/tests/llmount-server.sh b/lustre/tests/llmount-server.sh
index 909611d..b9ac8ae 100644 (file)
--- a/lustre/tests/llmount-server.sh
+++ b/lustre/tests/llmount-server.sh
@@ -13,7 +13,7 @@ insmod $R/usr/src/portals/linux/qswnal/kqswnal.o
 
 # $R/usr/src/portals/linux/utils/acceptor 1234 &
 
-$R/usr/src/portals/linux/utils/ptlctl <<EOF
+$PTLCTL <<EOF
 mynid
 setup elan
 connect 5
@@ -26,23 +26,21 @@ insmod $R/usr/src/obd/ext2obd/obdext2.o
 insmod $R/usr/src/obd/ost/ost.o
 insmod $R/usr/src/obd/mds/mds.o
 
-dd if=/dev/zero of=/tmp/ost bs=1024 count=10000
-mke2fs -b 4096 -F /tmp/ost
-losetup ${LOOP}0 /tmp/ost
-
-dd if=/dev/zero of=/tmp/mds bs=1024 count=10000
-mke2fs -b 4096 -F /tmp/mds
-losetup ${LOOP}1 /tmp/mds
+tmp_fs ext2 /tmp/ost 10000
+OST=${LOOPDEV}
+MDSFS=ext2
+tmp_fs ${MDSFS} /tmp/mds 10000
+MDS=${LOOPDEV}
 
 mknod /dev/obd c 10 241
 
-$R/usr/src/obd/utils/obdctl <<EOF
+$OBDCTL <<EOF
 device 0
 attach mds
-setup ${LOOP}1 ext2
+setup ${MDS} ${MDSFS}
 device 1
 attach obdext2
-setup ${LOOP}0
+setup ${OBD}
 device 2
 attach ost
 setup 1