scripts: zfs.sh: explicitly unload all modules via rmmod

modprobe -r only works for depmodded modules, but this also means we have to re-iterate legacy modules, and in the right order Reviewed-by: Brian Atkinson <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#13356
andrewc12 · Sep 23, 2022 · 69f8fe1 · 69f8fe1
1 parent f3f8ffb
commit 69f8fe1
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/scripts/zfs.sh b/scripts/zfs.sh
@@ -18,7 +18,7 @@ STACK_TRACER="no"
 
 ZED_PIDFILE=${ZED_PIDFILE:-/var/run/zed.pid}
 LDMOD=${LDMOD:-/sbin/modprobe}
-DELMOD=${DELMOD:-/sbin/modprobe -r}
+DELMOD=${DELMOD:-/sbin/rmmod}
 
 KMOD_ZLIB_DEFLATE=${KMOD_ZLIB_DEFLATE:-zlib_deflate}
 KMOD_ZLIB_INFLATE=${KMOD_ZLIB_INFLATE:-zlib_inflate}
@@ -162,9 +162,12 @@ unload_modules_freebsd() {
 }
 
 unload_modules_linux() {
-	NAME="${KMOD_ZFS##*/}"
-	NAME="${NAME%.ko}"
-	! [ -d "/sys/module/$NAME" ] || $DELMOD "$NAME" || return
+	legacy_kmods="icp zzstd zlua zcommon zunicode znvpair zavl"
+	for KMOD in "$KMOD_ZFS" $legacy_kmods "$KMOD_SPL"; do
+		NAME="${KMOD##*/}"
+		NAME="${NAME%.ko}"
+		! [ -d "/sys/module/$NAME" ] || $DELMOD "$NAME" || return
+	done
 
 	if [ "$VERBOSE" = "yes" ]; then
 		echo "Successfully unloaded ZFS module stack"