X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fzpios.sh;h=a5599a6d8c604cd3975cde89d3d499b8820cba36;hb=36391312afdfac5584ca40ef1af7721108ce4c20;hp=e16a58a3ba6cd927b9347c0f3176c7e7c30c3464;hpb=2ea9dc40f88ed84bc3e8022b91dd33cbce94653f;p=zfs.git

diff --git a/scripts/zpios.sh b/scripts/zpios.sh
index e16a58a..a5599a6 100755
--- a/scripts/zpios.sh
+++ b/scripts/zpios.sh
@@ -42,6 +42,15 @@ OPTIONS:
 EOF
 }
 
+unload_die() {
+	unload_modules
+	while [ -c /dev/zpios ]; do
+		sleep 1
+	done
+
+	exit 1
+}
+
 print_header() {
 	echo --------------------- ZPIOS RESULTS ----------------------------
 	echo -n "Date: "; date
@@ -242,7 +251,7 @@ fi
 # Create the zpool configuration
 ${ZPOOL_CREATE_SH} ${VERBOSE_FLAG} ${FORCE_FLAG} \
 	-p ${ZPOOL_NAME} -c ${ZPOOL_CONFIG} \
-	-l "${ZPOOL_OPTIONS}" -s "${ZFS_OPTIONS}" || exit 1
+	-l "${ZPOOL_OPTIONS}" -s "${ZFS_OPTIONS}" || unload_die
 
 if [ ${PROFILE} ]; then
 	zpios_profile_start
@@ -261,7 +270,7 @@ fi
 
 # Destroy the zpool configuration
 ${ZPOOL_CREATE_SH} ${VERBOSE_FLAG} ${FORCE_FLAG} \
-	-p ${ZPOOL_NAME} -c ${ZPOOL_CONFIG} -d || exit 1
+	-p ${ZPOOL_NAME} -c ${ZPOOL_CONFIG} -d || unload_die
 
 # Unload the test module stack and wait for device removal
 unload_modules