summaryrefslogtreecommitdiffstats
path: root/module/spl/spl-kstat.c
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2010-07-19 14:16:05 -0700
committerBrian Behlendorf <[email protected]>2010-07-20 13:29:35 -0700
commit55abb0929e4fbe326a9737650a167a1a988ad86b (patch)
tree7fa8db9d12b4416f7f7e8e21cde864b501303924 /module/spl/spl-kstat.c
parent8f813bb168eb21cd5d64b930ee015dcf93575331 (diff)
Split <sys/debug.h> header
To avoid symbol conflicts with dependent packages the debug header must be split in to several parts. The <sys/debug.h> header now only contains the Solaris macro's such as ASSERT and VERIFY. The spl-debug.h header contain the spl specific debugging infrastructure and should be included by any package which needs to use the spl logging. Finally the spl-trace.h header contains internal data structures only used for the log facility and should not be included by anythign by spl-debug.c. This way dependent packages can include the standard Solaris headers without picking up any SPL debug macros. However, if the dependant package want to integrate with the SPL debugging subsystem they can then explicitly include spl-debug.h. Along with this change I have dropped the CHECK_STACK macros because the upstream Linux kernel now has much better stack depth checking built in and we don't need this complexity. Additionally SBUG has been replaced with PANIC and provided as part of the Solaris macro set. While the Solaris version is really panic() that conflicts with the Linux kernel so we'll just have to make due to PANIC. It should rarely be called directly, the prefered usage would be an ASSERT or VERIFY. There's lots of change here but this cleanup was overdue.
Diffstat (limited to 'module/spl/spl-kstat.c')
-rw-r--r--module/spl/spl-kstat.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/module/spl/spl-kstat.c b/module/spl/spl-kstat.c
index 433f3e5b0..238f37ae3 100644
--- a/module/spl/spl-kstat.c
+++ b/module/spl/spl-kstat.c
@@ -24,8 +24,9 @@
* Solaris Porting Layer (SPL) Kstat Implementation.
\*****************************************************************************/
-#include <sys/kstat.h>
#include <linux/seq_file.h>
+#include <sys/kstat.h>
+#include <spl-debug.h>
static spinlock_t kstat_lock;
static struct list_head kstat_list;
@@ -72,7 +73,7 @@ kstat_seq_show_headers(struct seq_file *f)
"min", "max", "start", "stop");
break;
default:
- SBUG(); /* Unreachable */
+ PANIC("Undefined kstat type %d\n", ksp->ks_type);
}
}
@@ -135,7 +136,7 @@ kstat_seq_show_named(struct seq_file *f, kstat_named_t *knp)
seq_printf(f, "%s", KSTAT_NAMED_STR_PTR(knp));
break;
default:
- SBUG(); /* Unreachable */
+ PANIC("Undefined kstat data type %d\n", knp->data_type);
}
seq_printf(f, "\n");
@@ -210,7 +211,7 @@ kstat_seq_show(struct seq_file *f, void *p)
rc = kstat_seq_show_timer(f, (kstat_timer_t *)p);
break;
default:
- SBUG(); /* Unreachable */
+ PANIC("Undefined kstat type %d\n", ksp->ks_type);
}
return rc;
@@ -239,7 +240,7 @@ kstat_seq_data_addr(kstat_t *ksp, loff_t n)
rc = ksp->ks_data + n * sizeof(kstat_timer_t);
break;
default:
- SBUG(); /* Unreachable */
+ PANIC("Undefined kstat type %d\n", ksp->ks_type);
}
RETURN(rc);
@@ -377,7 +378,7 @@ __kstat_create(const char *ks_module, int ks_instance, const char *ks_name,
ksp->ks_data_size = ks_ndata * sizeof(kstat_timer_t);
break;
default:
- SBUG(); /* Unreachable */
+ PANIC("Undefined kstat type %d\n", ksp->ks_type);
}
if (ksp->ks_flags & KSTAT_FLAG_VIRTUAL) {