Update ostreq.sh script to use new helper functions.

diff --git a/lustre/tests/ostreq.sh b/lustre/tests/ostreq.sh
index 3d9d6c2..bdfd634 100644 (file)
--- a/lustre/tests/ostreq.sh
+++ b/lustre/tests/ostreq.sh
@@ -5,20 +5,9 @@ SRCDIR="`dirname $0`"
 
 SERVER=localhost
 
-mknod /dev/portals c 10 240
+setup
 
-insmod $R/usr/src/portals/linux/oslib/portals.o || exit -1
-insmod $R/usr/src/portals/linux/socknal/ksocknal.o || exit -1
-
-$R/usr/src/portals/linux/utils/acceptor 1234 &
-
-insmod $R/usr/src/obd/class/obdclass.o || exit -1
-insmod $R/usr/src/obd/rpc/ptlrpc.o || exit -1
-insmod $R/usr/src/obd/ext2obd/obdext2.o || exit -1
-insmod $R/usr/src/obd/ost/ost.o || exit -1
-insmod $R/usr/src/obd/osc/osc.o || exit -1
-
-$R/usr/src/portals/linux/utils/ptlctl <<EOF
+$PTLCTL <<EOF
 mynid localhost
 setup tcp
 connect $SERVER 1234
@@ -28,21 +17,13 @@ quit
 EOF
 
 
-dd if=/dev/zero of=/tmp/fs bs=1024 count=10000
-mke2fs -F /tmp/fs
-losetup ${LOOP}0 /tmp/fs || exit -1
-
-echo 4095 > /proc/sys/obd/debug
-echo 4095 > /proc/sys/obd/trace
-
-mknod /dev/obd c 10 241
-
-$R/usr/src/portals/linux/utils/debugctl modules > $R/tmp/ogdb
+tmp_fs ext2 /tmp/fs 10000
+OBD=${LOOPDEV}
 
-$R/usr/src/obd/utils/obdctl <<EOF
+$OBDCTL <<EOF
 device 0
 attach obdext2
-setup ${LOOP}0
+setup ${OBD}
 device 1
 attach ost
 setup 0