lock descriptor fixups

[fs/lustre-release.git] / lustre / tests / ostreq.sh

diff --git a/lustre/tests/ostreq.sh b/lustre/tests/ostreq.sh
index 685488f..24867c4 100644 (file)
--- a/lustre/tests/ostreq.sh
+++ b/lustre/tests/ostreq.sh
@@ -1,50 +1,36 @@
 #!/bin/sh
 
-SRCDIR="`dirname $0`"
+SRCDIR="`dirname $0`/"
 . $SRCDIR/common.sh
 
 SERVER=localhost
+PORT=1234
 
-mknod /dev/portals c 10 240
+$ACCEPTOR $PORT
 
-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 &
-
-$R/usr/src/portals/linux/utils/ptlctl <<EOF
-mynid
+$PTLCTL <<EOF
+mynid localhost
 setup tcp
-connect $SERVER 1234
-add_uuid ost
+connect $SERVER $PORT
+add_uuid $SERVER
 add_uuid self
 quit
 EOF
 
-insmod $R/usr/src/obd/rpc/ptlrpc.o || exit -1
-insmod $R/usr/src/obd/class/obdclass.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
-
-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
+setup_lustre
 
-mknod /dev/obd c 10 241
+tmp_fs ext2 /tmp/fs 10000
+OBD=${LOOPDEV}
 
-$R/usr/src/obd/utils/obdctl <<EOF
+$OBDCTL <<EOF
 device 0
-attach obdext2
-setup ${LOOP}0
+attach obdext2 OBDEXT2DEV
+setup ${OBD}
 device 1
-attach ost
+attach ost OSTDEV
 setup 0
 device 2
-attach osc
-setup
+attach osc OSCDEV
+setup -1
 quit
 EOF