X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fllmountcleanup.sh;h=454ed6eecc801b68a7f2b599a94e6a8968ad7324;hb=ff35e27da4c76bc93c7641ef54d425d77e821e9f;hp=0448d31a16574f4aa82ec8a6d319b7e08bfb9892;hpb=6652b673b927f3728e1ce750fd0ff4a716f9904c;p=fs%2Flustre-release.git

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index 0448d31..454ed6e 100755
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -1,79 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
-SRCDIR="`dirname $0`/"
-. $SRCDIR/common.sh
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
+. $LUSTRE/tests/test-framework.sh
+init_test_env $@
 
-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
-
-$OBDCTL <<EOF
-name2dev MDCDEV
-cleanup
-detach
-name2dev OSCDEV
-cleanup
-detach
-name2dev OSTDEV
-cleanup
-detach
-name2dev OBDDEV
-cleanup
-detach
-name2dev MDSDEV
-cleanup
-detach
-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
-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 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
+cleanupall -f