diff options
| author | Brian Behlendorf <[email protected]> | 2012-03-23 12:03:57 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-03-23 12:11:50 -0700 |
| commit | 0835057ee7ab61b3e0c794a70da984712fce4384 (patch) | |
| tree | 338d51caaa8b44d4e7b16878470731cec751ad76 | |
| parent | 5d139aaa2b0d7c635e1f3ea0423dc428e844896a (diff) | |
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 <[email protected]>
| -rw-r--r-- | include/sys/sysmacros.h | 2 | ||||
| -rw-r--r-- | module/spl/spl-generic.c | 16 | ||||
| -rw-r--r-- | module/splat/splat-ctl.c | 8 |
3 files changed, 14 insertions, 12 deletions
diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h index 7a4faa666..97257e078 100644 --- 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 e62e4a7a9..be099aaae 100644 --- 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 dd1ece05b..399b09c4d 100644 --- 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; } |