X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fllmountcleanup.sh;h=454ed6eecc801b68a7f2b599a94e6a8968ad7324;hb=refs%2Fchanges%2F19%2F34819%2F9;hp=caa07d3bb8272649ea4036126d616ecb429fc61d;hpb=0e09dc78da5b3e118ecca326fee62b06d9381a83;p=fs%2Flustre-release.git

diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index caa07d3..454ed6e 100755
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -1,60 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
-SRCDIR="`dirname $0`"
-. $SRCDIR/common.sh
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
+. $LUSTRE/tests/test-framework.sh
+init_test_env $@
 
-umount /mnt/lustre || fail "cannot unmount"
-
-killall acceptor
-rmmod llite
-rmmod mdc
-
-$OBDCTL <<EOF
-name2dev OSCDEV
-cleanup
-detach
-name2dev LDLMDEV
-cleanup
-detach
-name2dev RPCDEV
-cleanup
-detach
-name2dev OSTDEV
-cleanup
-detach
-name2dev FILTERDEV
-cleanup
-detach
-name2dev MDSDEV
-cleanup
-detach
-quit
-EOF
-
-rmmod obdecho
-rmmod mds
-rmmod osc
-rmmod ost
-rmmod obdfilter
-rmmod obdext2
-rmmod ldlm
-rmmod ptlrpc
-rmmod obdclass
-
-$PTLCTL <<EOF
-setup tcp
-disconnect
-del_uuid self
-del_uuid mds
-del_uuid ost
-del_uuid ldlm
-quit
-EOF
-
-rmmod kqswnal
-rmmod ksocknal
-rmmod portals
-
-losetup -d ${LOOP}0
-losetup -d ${LOOP}1
-losetup -d ${LOOP}2
+cleanupall -f