Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-01-13 11:18:12 -08:00
parent 6825690106 f15ef90618
commit 7461d1eb69
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
module/zpios/zpios.c
View File

@ -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;
}

16
scripts/zpios.sh
View File

@ -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