Add SPL_META_RELEASE to module load/unload messages

Include the ZFS_META_RELEASE in the module load/unload messages
to more clearly indicate exactly what version of the SPL has
been loaded.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h
index 7a4faa66632dbb9d44885afca739625697e2da3f..97257e07819a610f624d5ba586c3cd74cb2480d8 100644 (file)
--- a/include/sys/sysmacros.h
+++ b/include/sys/sysmacros.h
@@ -136,7 +136,7 @@
 #define DTRACE_PROBE4(a, b, c, d, e, f, g, h, i)       ((void)0)
 
 /* Missing globals */
-extern char spl_version[16];
+extern char spl_version[32];
 extern unsigned long spl_hostid;
 extern char hw_serial[11];
 

diff --git a/module/spl/spl-generic.c b/module/spl/spl-generic.c
index e62e4a7a98bc74e17ce2ef36d10514d481f73b9c..be099aaae83d81ade8bc162478e18c1db02020f6 100644 (file)
--- a/module/spl/spl-generic.c
+++ b/module/spl/spl-generic.c
@@ -49,7 +49,7 @@
 
 #define SS_DEBUG_SUBSYS SS_GENERIC
 
-char spl_version[16] = "SPL v" SPL_META_VERSION;
+char spl_version[32] = "SPL v" SPL_META_VERSION "-" SPL_META_RELEASE;
 EXPORT_SYMBOL(spl_version);
 
 unsigned long spl_hostid = HW_INVALID_HOSTID;
@@ -597,8 +597,9 @@ __init spl_init(void)
        if ((rc = spl_vn_init_kallsyms_lookup()))
                SGOTO(out10, rc);
 
-       printk(KERN_NOTICE "SPL: Loaded module v%s%s, using hostid 0x%08x\n",
-              SPL_META_VERSION, SPL_DEBUG_STR, (unsigned int) spl_hostid);
+       printk(KERN_NOTICE "SPL: Loaded module v%s-%s%s, using hostid "
+              "0x%08x\n", SPL_META_VERSION, SPL_META_RELEASE, SPL_DEBUG_STR,
+              (unsigned int) spl_hostid);
        SRETURN(rc);
 out10:
        spl_zlib_fini();
@@ -621,8 +622,9 @@ out2:
 out1:
        spl_debug_fini();
 
-       printk(KERN_NOTICE "SPL: Failed to Load Solaris Porting Layer v%s%s"
-              ", rc = %d\n", SPL_META_VERSION, SPL_DEBUG_STR, rc);
+       printk(KERN_NOTICE "SPL: Failed to Load Solaris Porting Layer "
+              "v%s-%s%s, rc = %d\n", SPL_META_VERSION, SPL_META_RELEASE,
+              SPL_DEBUG_STR, rc);
        return rc;
 }
 
@@ -631,8 +633,8 @@ spl_fini(void)
 {
        SENTRY;
 
-       printk(KERN_NOTICE "SPL: Unloaded module v%s%s\n",
-              SPL_META_VERSION, SPL_DEBUG_STR);
+       printk(KERN_NOTICE "SPL: Unloaded module v%s-%s%s\n",
+              SPL_META_VERSION, SPL_META_RELEASE, SPL_DEBUG_STR);
        spl_zlib_fini();
        spl_tsd_fini();
        spl_kstat_fini();

diff --git a/module/splat/splat-ctl.c b/module/splat/splat-ctl.c
index dd1ece05bc3ab74dea946c722e251dfec7dcea44..399b09c4d328ed5cdacf79d6c9d103411a3c4259 100644 (file)
--- a/module/splat/splat-ctl.c
+++ b/module/splat/splat-ctl.c
@@ -664,8 +664,8 @@ splat_init(void)
                                         MKDEV(SPLAT_MAJOR, 0),
                                         NULL, SPLAT_NAME);
 
-       printk(KERN_INFO "SPLAT: Loaded module v%s%s\n",
-              SPL_META_VERSION, SPL_DEBUG_STR);
+       printk(KERN_INFO "SPLAT: Loaded module v%s-%s%s\n",
+              SPL_META_VERSION, SPL_META_RELEASE, SPL_DEBUG_STR);
        return 0;
 error:
        printk(KERN_ERR "SPLAT: Error registering splat device, %d\n", rc);
@@ -700,8 +700,8 @@ splat_fini(void)
        SPLAT_SUBSYSTEM_FINI(kmem);
 
        ASSERT(list_empty(&splat_module_list));
-       printk(KERN_INFO "SPLAT: Unloaded module v%s%s\n",
-              SPL_META_VERSION, SPL_DEBUG_STR);
+       printk(KERN_INFO "SPLAT: Unloaded module v%s-%s%s\n",
+              SPL_META_VERSION, SPL_META_RELEASE, SPL_DEBUG_STR);
 
        return 0;
 }