Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Display DEBUG keyword during module load when --enable-debug is used. 

Signed-off-by: Ricardo M. Correia <ricardo.correia@oracle.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Ricardo M. Correia 2010-07-20 15:25:45 -07:00 committed by Brian Behlendorf
parent 2c762de830
commit 81672c0122
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/sys/debug.h
View File

@ -46,6 +46,9 @@
#ifdef NDEBUG /* Debugging Disabled */ #ifdef NDEBUG /* Debugging Disabled */
/* Define SPL_DEBUG_STR to make clear which ASSERT definitions are used */
#define SPL_DEBUG_STR ""
#define PANIC(fmt, a...) \ #define PANIC(fmt, a...) \
do { \ do { \
printk(KERN_EMERG fmt, ## a); \ printk(KERN_EMERG fmt, ## a); \
@ -81,6 +84,9 @@ do { \
#else /* Debugging Enabled */ #else /* Debugging Enabled */
/* Define SPL_DEBUG_STR to make clear which ASSERT definitions are used */
#define SPL_DEBUG_STR " (DEBUG mode)"
#define PANIC(fmt, a...) \ #define PANIC(fmt, a...) \
do { \ do { \
spl_debug_msg(NULL, 0, 0, \ spl_debug_msg(NULL, 0, 0, \

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

@ -478,7 +478,8 @@ __init spl_init(void)
if ((rc = spl_kmem_init_kallsyms_lookup())) if ((rc = spl_kmem_init_kallsyms_lookup()))
SGOTO(out8, rc); SGOTO(out8, rc);
printk("SPL: Loaded Solaris Porting Layer v%s\n", SPL_META_VERSION); printk(KERN_NOTICE "SPL: Loaded Solaris Porting Layer v%s%s\n",
SPL_META_VERSION, SPL_DEBUG_STR);
SRETURN(rc); SRETURN(rc);
out8: out8:
kstat_fini(); kstat_fini();
@ -497,8 +498,8 @@ out2:
out1: out1:
debug_fini(); debug_fini();
printk("SPL: Failed to Load Solaris Porting Layer v%s, " printk(KERN_NOTICE "SPL: Failed to Load Solaris Porting Layer v%s%s"
"rc = %d\n", SPL_META_VERSION, rc); ", rc = %d\n", SPL_META_VERSION, SPL_DEBUG_STR, rc);
return rc; return rc;
} }
@ -507,7 +508,8 @@ spl_fini(void)
{ {
SENTRY; SENTRY;
printk("SPL: Unloaded Solaris Porting Layer v%s\n", SPL_META_VERSION); printk(KERN_NOTICE "SPL: Unloaded Solaris Porting Layer v%s%s\n",
SPL_META_VERSION, SPL_DEBUG_STR);
kstat_fini(); kstat_fini();
proc_fini(); proc_fini();
vn_fini(); vn_fini();