From 68585e71a85811a95b94fac1ef45d7e26ae4c91a Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 9 Jan 2009 13:28:42 -0800 Subject: [PATCH 1/3] Get correct exit prototype --- module/zfs/zfs_ioctl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index 919dc65f04..8d6dbf7b8b 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -3181,8 +3181,14 @@ _fini(void) } #ifdef HAVE_SPL +void +__fini(void) +{ + _fini(); +} + module_init(_init); -module_exit(_fini); +module_exit(__fini); MODULE_AUTHOR("Sun Microsystems, Inc"); MODULE_DESCRIPTION("ZFS"); From ca4fc6ef6303fb2164ff963353dd8dced0484ffe Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 9 Jan 2009 13:29:41 -0800 Subject: [PATCH 2/3] Fix cast --- module/zfs/zfs_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index 62e105b471..1111418340 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -2189,7 +2189,7 @@ zfs_ioc_snapshot(zfs_cmd_t *zc) if (snapshot_namecheck(zc->zc_value, NULL, NULL) != 0) return (EINVAL); - if (zc->zc_nvlist_src != NULL && + if (zc->zc_nvlist_src != 0 && (error = get_nvlist(zc->zc_nvlist_src, zc->zc_nvlist_src_size, &nvprops)) != 0) return (error); From 04638ead670d244b84cece9fd336b6a5a4d6a54d Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 9 Jan 2009 13:31:16 -0800 Subject: [PATCH 3/3] Change zpool module name to zfs and update references --- module/zfs/Makefile.in | 2 +- scripts/zfs.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/zfs/Makefile.in b/module/zfs/Makefile.in index 7d04843de7..44d0560eca 100644 --- a/module/zfs/Makefile.in +++ b/module/zfs/Makefile.in @@ -1,6 +1,6 @@ DISTFILES = *.c -MODULE := zpool +MODULE := zfs EXTRA_CFLAGS = -I@MODDIR@/zfs/include EXTRA_CFLAGS += -I@MODDIR@/zcommon/include diff --git a/scripts/zfs.sh b/scripts/zfs.sh index d724cad40d..0e2f87250c 100755 --- a/scripts/zfs.sh +++ b/scripts/zfs.sh @@ -22,7 +22,7 @@ zfs_modules=( \ ${MODDIR}/nvpair/znvpair.ko \ ${MODDIR}/unicode/zunicode.ko \ ${MODDIR}/zcommon/zcommon.ko \ - ${MODDIR}/zfs/zpool.ko \ + ${MODDIR}/zfs/zfs.ko \ ) test_modules=( \ @@ -58,8 +58,8 @@ OPTIONS: MODULE-OPTIONS: Must be of the frm module="options", for example: -$0 zpool="zfs_prefetch_disable=1" -$0 zpool="zfs_prefetch_disable=1 zfs_mdcomp_disable=1" +$0 zfs="zfs_prefetch_disable=1" +$0 zfs="zfs_prefetch_disable=1 zfs_mdcomp_disable=1" $0 spl="spl_debug_mask=0" EOF