From 6e2c55b5a687142627a5ec1fe3ce29f78be20423 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 1 Oct 2009 16:47:49 -0700
Subject: [PATCH] Update to use spl_module_{init,exit}() macro API.

---
 module/avl/avl.c             | 15 ++++-----------
 module/nvpair/nvpair.c       | 15 ++++-----------
 module/unicode/u8_textprep.c | 15 ++++-----------
 module/zcommon/zfs_prop.c    | 27 ++++++++++-----------------
 module/zfs/zfs_ioctl.c       | 27 ++++-----------------------
 5 files changed, 26 insertions(+), 73 deletions(-)

diff --git a/module/avl/avl.c b/module/avl/avl.c
index 3212de9bae..728bd87234 100644
--- a/module/avl/avl.c
+++ b/module/avl/avl.c
@@ -1033,18 +1033,11 @@ done:
 }
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
-static int __init avl_init(void)
-{
-	return 0;
-}
+static int avl_init(void) { return 0; }
+static int avl_fini(void) { return 0; }
 
-static void avl_fini(void)
-{
-        return;
-}
-
-module_init(avl_init);
-module_exit(avl_fini);
+spl_module_init(avl_init);
+spl_module_exit(avl_fini);
 
 MODULE_AUTHOR("Sun Microsystems, Inc");
 MODULE_DESCRIPTION("Generic AVL tree implementation");
diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c
index 0da298d845..5bee964294 100644
--- a/module/nvpair/nvpair.c
+++ b/module/nvpair/nvpair.c
@@ -3246,18 +3246,11 @@ nvs_xdr(nvstream_t *nvs, nvlist_t *nvl, char *buf, size_t *buflen)
 }
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
-static int __init nvpair_init(void)
-{
-	        return 0;
-}
+static int nvpair_init(void) { return 0; }
+static int nvpair_fini(void) { return 0; }
 
-static void nvpair_fini(void)
-{
-	        return;
-}
-
-module_init(nvpair_init);
-module_exit(nvpair_fini);
+spl_module_init(nvpair_init);
+spl_module_exit(nvpair_fini);
 
 MODULE_AUTHOR("Sun Microsystems, Inc");
 MODULE_DESCRIPTION("Generic name/value pair implementation");
diff --git a/module/unicode/u8_textprep.c b/module/unicode/u8_textprep.c
index 248691bd00..37fb2e5a46 100644
--- a/module/unicode/u8_textprep.c
+++ b/module/unicode/u8_textprep.c
@@ -2133,18 +2133,11 @@ u8_textprep_str(char *inarray, size_t *inlen, char *outarray, size_t *outlen,
 }
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
-static int __init unicode_init(void)
-{
-	return 0;
-}
+static int unicode_init(void) { return 0; }
+static int unicode_fini(void) { return 0; }
 
-static void unicode_fini(void)
-{
-	return;
-}
-
-module_init(unicode_init);
-module_exit(unicode_fini);
+spl_module_init(unicode_init);
+spl_module_exit(unicode_fini);
 
 MODULE_AUTHOR("Sun Microsystems, Inc");
 MODULE_DESCRIPTION("Unicode implementation");
diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c
index 0a7d020151..45943602c0 100644
--- a/module/zcommon/zfs_prop.c
+++ b/module/zcommon/zfs_prop.c
@@ -534,6 +534,16 @@ zfs_prop_align_right(zfs_prop_t prop)
 #endif
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
+static int zcommon_init(void) { return 0; }
+static int zcommon_fini(void) { return 0; }
+
+spl_module_init(zcommon_init);
+spl_module_exit(zcommon_fini);
+
+MODULE_AUTHOR("Sun Microsystems, Inc");
+MODULE_DESCRIPTION("Generic ZFS support");
+MODULE_LICENSE("CDDL");
+
 /* zfs dataset property functions */
 EXPORT_SYMBOL(zfs_userquota_prop_prefixes);
 EXPORT_SYMBOL(zfs_prop_init);
@@ -555,21 +565,4 @@ EXPORT_SYMBOL(zfs_prop_index_to_string);
 EXPORT_SYMBOL(zfs_prop_string_to_index);
 EXPORT_SYMBOL(zfs_prop_valid_for_type);
 
-static int __init zcommon_init(void)
-{
-	return 0;
-}
-
-static void zcommon_fini(void)
-{
-	return;
-}
-
-module_init(zcommon_init);
-module_exit(zcommon_fini);
-
-MODULE_AUTHOR("Sun Microsystems, Inc");
-MODULE_DESCRIPTION("Generic ZFS support");
-MODULE_LICENSE("CDDL");
-
 #endif
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index c33969ee57..d73b83499c 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -3847,6 +3847,8 @@ _init(void)
 	ASSERT(error == 0);
 	mutex_init(&zfs_share_lock, NULL, MUTEX_DEFAULT, NULL);
 
+	printk(KERN_INFO "ZFS: Loaded ZFS Filesystem v%s\n", ZFS_META_VERSION);
+
 	return (0);
 }
 
@@ -3880,29 +3882,8 @@ _fini(void)
 }
 
 #ifdef HAVE_SPL
-int
-init(void)
-{
-	int rc;
-
-	rc = _init();
-	if (!rc)
-		printk(KERN_INFO "ZFS: Loaded ZFS Filesystem v%s\n",
-		       ZFS_META_VERSION);
-
-	return rc;
-}
-
-void
-fini(void)
-{
-	(void)_fini();
-	printk(KERN_INFO "ZFS: Unloaded ZFS Filesystem v%s\n",
-	       ZFS_META_VERSION);
-}
-
-module_init(init);
-module_exit(fini);
+spl_module_init(_init);
+spl_module_exit(_fini);
 
 MODULE_AUTHOR("Sun Microsystems, Inc");
 MODULE_DESCRIPTION("ZFS");