From 7356c2045ea6b255a1dc6895de32d030e5d82cb4 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 13 Jan 2009 11:16:12 -0800
Subject: [PATCH] Update zpios.sh script to reference zfs not zpool,
 additionally remove unneed module load console message

---
 module/zpios/zpios.c |  3 ---
 scripts/zpios.sh     | 16 +++++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/module/zpios/zpios.c b/module/zpios/zpios.c
index 94065eb27f..e4a7285d74 100644
--- a/module/zpios/zpios.c
+++ b/module/zpios/zpios.c
@@ -1264,8 +1264,6 @@ kpios_init(void)
 	}
 
 	class_device_create(kpios_class, NULL, dev, NULL, "kpios");
-
-	printk(KERN_INFO "kpios: Loaded Kernel PIOS Tests v%s\n", VERSION);
 	return 0;
 error:
 	printk(KERN_ERR "kpios: Error registering kpios device, %d\n", rc);
@@ -1283,7 +1281,6 @@ kpios_fini(void)
 	cdev_del(&kpios_cdev);
 	unregister_chrdev_region(dev, KPIOS_MINORS);
 
-	printk(KERN_INFO "kpios: Unloaded Kernel PIOS Tests\n");
 	return;
 }
 
diff --git a/scripts/zpios.sh b/scripts/zpios.sh
index e48c28df13..8b32d4feaa 100755
--- a/scripts/zpios.sh
+++ b/scripts/zpios.sh
@@ -3,8 +3,8 @@
 prog=zpios.sh
 . ../.script-config
 
-SPL_OPTIONS="spl=spl_debug_mask=0 spl_debug_subsys=0 ${1}"
-ZPOOL_OPTIONS="zpool=$2"
+SPL_OPTIONS="spl=spl_debug_mask=-1 spl_debug_subsys=-1 spl_debug_mb=10 ${1}"
+ZFS_OPTIONS="zfs=$2"
 ZPIOS_OPTIONS=$3
 PROFILE_ZPIOS_LOGS=$4
 ZPIOS_PRE=$5
@@ -27,13 +27,19 @@ echo ---------------------- SPL Sysctl Tunings ------------------------------
 sysctl -A | grep spl
 echo
 
-echo ------------------- SPL/ZPOOL Module Tunings ---------------------------
+echo ------------------- SPL Module Tunings ---------------------------
 if [ -d /sys/module/spl/parameters ]; then
 	grep [0-9] /sys/module/spl/parameters/*
-	grep [0-9] /sys/module/zpool/parameters/*
 else
 	grep [0-9] /sys/module/spl/*
-	grep [0-9] /sys/module/zpool/*
+fi
+echo
+
+echo ------------------- ZFS Module Tunings ---------------------------
+if [ -d /sys/module/zfs/parameters ]; then
+	grep [0-9] /sys/module/zfs/parameters/*
+else
+	grep [0-9] /sys/module/zfs/*
 fi
 echo