X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fllmountcleanup.sh;h=0448d31a16574f4aa82ec8a6d319b7e08bfb9892;hb=ce6fead2306cbfc7c6184eb232dddc26c98fac2e;hp=196d2745aea570af7175af4843288b23dfb30f91;hpb=06fb20cfda6b2fe1c3b3e909d1448548505d033a;p=fs%2Flustre-release.git

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index 196d274..0448d31 100755
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -1,32 +1,50 @@
 #!/bin/sh
 
-SRCDIR="`dirname $0`"
+SRCDIR="`dirname $0`/"
 . $SRCDIR/common.sh
 
-umount /mnt/lustre
+TIME=`date +'%s'`
+
+$DBGCTL debug_kernel /tmp/debug.1.$TIME 1
+
+if mount | grep '/mnt/lustre'; then
+	umount /mnt/lustre || fail "cannot unmount"
+fi
 
 killall acceptor
 rmmod llite
-rmmod mdc
 
 $OBDCTL <<EOF
-device 3
+name2dev MDCDEV
+cleanup
+detach
+name2dev OSCDEV
+cleanup
+detach
+name2dev OSTDEV
 cleanup
 detach
-device 2
+name2dev OBDDEV
 cleanup
 detach
-device 1
+name2dev MDSDEV
 cleanup
 detach
-device 0
+name2dev LDLMDEV
+cleanup
+detach
+name2dev RPCDEV
 cleanup
 detach
 quit
 EOF
 
 rmmod obdecho
+rmmod mds_extN
+rmmod mds_ext3
+rmmod mds_ext2
 rmmod mds
+rmmod mdc
 rmmod osc
 rmmod ost
 rmmod obdfilter
@@ -34,21 +52,28 @@ rmmod obdext2
 rmmod ldlm
 rmmod ptlrpc
 rmmod obdclass
+rmmod extN
+
+$DBGCTL debug_kernel /tmp/debug.2.$TIME 1
 
 $PTLCTL <<EOF
 setup tcp
 disconnect
 del_uuid self
-del_uuid mds
-del_uuid ost
-del_uuid ldlm
+del_uuid localhost
+del_uuid localhost
+del_uuid localhost
 quit
 EOF
 
 rmmod kqswnal
 rmmod ksocknal
+
+$DBGCTL debug_kernel /tmp/debug.3.$TIME 1
+
 rmmod portals
 
 losetup -d ${LOOP}0
 losetup -d ${LOOP}1
 losetup -d ${LOOP}2
+exit 0