X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fscripts%2Flustre_rmmod;h=a4f81d885674ff783bb178a66ddcc7b7b4de09ed;hb=ad1810a2dbea1eed5e8b5feb55bdf915a545feb3;hp=b1020f44dfb6e41af7d9bf80ff0f7f9e6ef9045a;hpb=69cf4a311196f841c3016c526f1e79a9812b6912;p=fs%2Flustre-release.git

diff --git a/lustre/scripts/lustre_rmmod b/lustre/scripts/lustre_rmmod
index b1020f4..a4f81d8 100755
--- a/lustre/scripts/lustre_rmmod
+++ b/lustre/scripts/lustre_rmmod
@@ -19,17 +19,18 @@ fi
 unload_dep_module() {
     # libcfs                107852  17 llite_lloop,lustre,obdfilter,ost,...
     local MODULE=$1
-    local DEPS=$(lsmod | awk '($1 == "'$MODULE'") { print $4 }' | tr ',' ' ')
+    local DEPS="$(lsmod | awk '($1 == "'$MODULE'") { print $4 }' | tr ',' ' ')"
     for SUBMOD in $DEPS; do
         unload_dep_module $SUBMOD
     done
-    [ "$MODULE" = "libcfs" ] && $LCTL dk $TMP/debug || true
-    $RMMOD $MODULE || true
+    [ "$MODULE" = "libcfs" ] && $LCTL dk $TMP/debug >/dev/null || true
+    $RMMOD $MODULE 2>/dev/null || true
+    return 0
 }
 
-lsmod | grep libcfs > /dev/null && $LCTL dl
-lsmod | grep $FSTYPE && unload_dep_module $FSTYPE
-unload_dep_module libcfs
+lsmod | grep obdclass > /dev/null && $LCTL dl
+lsmod | grep $FSTYPE > /dev/null && unload_dep_module $FSTYPE
+lsmod | grep libcfs > /dev/null && unload_dep_module libcfs
 
 MODULES=$($LCTL modules | awk '{ print $2 }')
 if [ -n "$MODULES" ]; then