From: adilger <adilger>
Date: Fri, 19 Jul 2002 04:49:14 +0000 (+0000)
Subject: Same fixes on head as branch.
X-Git-Tag: 0.5.1~36
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=6f4feb0c454427e4bb6fb61ff0269a1bdaf7773a;p=fs%2Flustre-release.git

Same fixes on head as branch.
---

diff --git a/lustre/tests/common.sh b/lustre/tests/common.sh
index a9887181..f764c8e 100644
--- a/lustre/tests/common.sh
+++ b/lustre/tests/common.sh
@@ -41,11 +41,12 @@ do_insmod() {
 	MODULE=$1
 	BASE=`echo $MODULE | sed -e "s^.*/^^" -e "s/\.o$//"`
 
+	lsmod | grep -q "\<$BASE\>" && return 0
+	[ "$MODULE" ] || fail "usage: $0 <module>"
+
 	if [ "$USEDEV" = "yes" ]; then
-		[ "$MODULE" ] || fail "usage: $0 <module>"
 		[ -f $MODULE ] || echo "$0: module '$MODULE' not found" 1>&2
-		lsmod | grep -q "\<$BASE\>" && return 0
-		insmod  $MODULE
+		insmod $MODULE
         else
 		insmod $BASE
 	fi
@@ -537,7 +538,6 @@ cleanup_portals() {
 	do_rmmod kptlrouter
 	do_rmmod kqswnal
 	do_rmmod ksocknal
-        do_rmmod kptlrouter
 	do_rmmod portals
 }