c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-27 10:24:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add SPL_META_RELEASE to module load/unload messages

Browse Source 
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>
This commit is contained in:
Brian Behlendorf 2012-03-23 12:03:57 -07:00
parent 5d139aaa2b
commit 0835057ee7
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sys/sysmacros.h
View File

@ -136,7 +136,7 @@
#define DTRACE_PROBE4(a, b, c, d, e, f, g, h, i) ((void)0) #define DTRACE_PROBE4(a, b, c, d, e, f, g, h, i) ((void)0)
/* Missing globals */ /* Missing globals */
extern char spl_version[16]; extern char spl_version[32];
extern unsigned long spl_hostid; extern unsigned long spl_hostid;
extern char hw_serial[11]; extern char hw_serial[11];

16
module/spl/spl-generic.c
View File

@ -49,7 +49,7 @@
#define SS_DEBUG_SUBSYS SS_GENERIC #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); EXPORT_SYMBOL(spl_version);
unsigned long spl_hostid = HW_INVALID_HOSTID; unsigned long spl_hostid = HW_INVALID_HOSTID;
@ -597,8 +597,9 @@ __init spl_init(void)
if ((rc = spl_vn_init_kallsyms_lookup())) if ((rc = spl_vn_init_kallsyms_lookup()))
SGOTO(out10, rc); SGOTO(out10, rc);
printk(KERN_NOTICE "SPL: Loaded module v%s%s, using hostid 0x%08x\n", printk(KERN_NOTICE "SPL: Loaded module v%s-%s%s, using hostid "
SPL_META_VERSION, SPL_DEBUG_STR, (unsigned int) spl_hostid); "0x%08x\n", SPL_META_VERSION, SPL_META_RELEASE, SPL_DEBUG_STR,
(unsigned int) spl_hostid);
SRETURN(rc); SRETURN(rc);
out10: out10:
spl_zlib_fini(); spl_zlib_fini();
@ -621,8 +622,9 @@ out2:
out1: out1:
spl_debug_fini(); spl_debug_fini();
printk(KERN_NOTICE "SPL: Failed to Load Solaris Porting Layer v%s%s" printk(KERN_NOTICE "SPL: Failed to Load Solaris Porting Layer "
", rc = %d\n", SPL_META_VERSION, SPL_DEBUG_STR, rc); "v%s-%s%s, rc = %d\n", SPL_META_VERSION, SPL_META_RELEASE,
SPL_DEBUG_STR, rc);
return rc; return rc;
} }
@ -631,8 +633,8 @@ spl_fini(void)
{ {
SENTRY; SENTRY;
printk(KERN_NOTICE "SPL: Unloaded module v%s%s\n", printk(KERN_NOTICE "SPL: Unloaded module v%s-%s%s\n",
SPL_META_VERSION, SPL_DEBUG_STR); SPL_META_VERSION, SPL_META_RELEASE, SPL_DEBUG_STR);
spl_zlib_fini(); spl_zlib_fini();
spl_tsd_fini(); spl_tsd_fini();
spl_kstat_fini(); spl_kstat_fini();

8
module/splat/splat-ctl.c
View File

@ -664,8 +664,8 @@ splat_init(void)
MKDEV(SPLAT_MAJOR, 0), MKDEV(SPLAT_MAJOR, 0),
NULL, SPLAT_NAME); NULL, SPLAT_NAME);
printk(KERN_INFO "SPLAT: Loaded module v%s%s\n", printk(KERN_INFO "SPLAT: Loaded module v%s-%s%s\n",
SPL_META_VERSION, SPL_DEBUG_STR); SPL_META_VERSION, SPL_META_RELEASE, SPL_DEBUG_STR);
return 0; return 0;
error: error:
printk(KERN_ERR "SPLAT: Error registering splat device, %d\n", rc); printk(KERN_ERR "SPLAT: Error registering splat device, %d\n", rc);
@ -700,8 +700,8 @@ splat_fini(void)
SPLAT_SUBSYSTEM_FINI(kmem); SPLAT_SUBSYSTEM_FINI(kmem);
ASSERT(list_empty(&splat_module_list)); ASSERT(list_empty(&splat_module_list));
printk(KERN_INFO "SPLAT: Unloaded module v%s%s\n", printk(KERN_INFO "SPLAT: Unloaded module v%s-%s%s\n",
SPL_META_VERSION, SPL_DEBUG_STR); SPL_META_VERSION, SPL_META_RELEASE, SPL_DEBUG_STR);
return 0; return 0;
} }