From: Ricardo M. Correia <ricardo.correia@oracle.com>
Date: Tue, 20 Jul 2010 22:25:45 +0000 (-0700)
Subject: Display DEBUG keyword during module load when --enable-debug is used.
X-Git-Tag: spl-0.5.0~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81672c012249f1ba81a27a1ff8f9b19b4a8048a8;p=spl

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>
---

diff --git a/include/sys/debug.h b/include/sys/debug.h
index 0da7e31..fbf1514 100644
--- a/include/sys/debug.h
+++ b/include/sys/debug.h
@@ -46,6 +46,9 @@
 
 #ifdef NDEBUG /* Debugging Disabled */
 
+/* Define SPL_DEBUG_STR to make clear which ASSERT definitions are used */
+#define SPL_DEBUG_STR	""
+
 #define PANIC(fmt, a...)						\
 do {									\
 	printk(KERN_EMERG fmt, ## a);					\
@@ -81,6 +84,9 @@ do {									\
 
 #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...)						\
 do {									\
 	spl_debug_msg(NULL, 0, 0,					\
diff --git a/module/spl/spl-generic.c b/module/spl/spl-generic.c
index a7083b6..57136cd 100644
--- a/module/spl/spl-generic.c
+++ b/module/spl/spl-generic.c
@@ -478,7 +478,8 @@ __init spl_init(void)
 	if ((rc = spl_kmem_init_kallsyms_lookup()))
 		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);
 out8:
 	kstat_fini();
@@ -497,8 +498,8 @@ out2:
 out1:
 	debug_fini();
 
-	printk("SPL: Failed to Load Solaris Porting Layer v%s, "
-	       "rc = %d\n", SPL_META_VERSION, rc);
+	printk(KERN_NOTICE "SPL: Failed to Load Solaris Porting Layer v%s%s"
+	       ", rc = %d\n", SPL_META_VERSION, SPL_DEBUG_STR, rc);
 	return rc;
 }
 
@@ -507,7 +508,8 @@ spl_fini(void)
 {
 	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();
 	proc_fini();
 	vn_fini();