aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2009-01-13 11:43:05 -0800
committerBrian Behlendorf <[email protected]>2009-01-13 11:43:05 -0800
commitb172b6dfdec0c14ddd5bf3b1d6a81b07c63788c5 (patch)
tree6cb5bc8a73f31474e5901f8db2162d9adfa44b36
parentb871b8cdef68bdfa99e0fdc45734af810b75e998 (diff)
TASKQ_DYNAMIC not yet support, do not create the global taskq with that flag or we crash with debug enabled. Also don't bother dumping debug when debugging is diabled, it's pointless
-rw-r--r--modules/spl/spl-debug.c2
-rw-r--r--modules/spl/spl-taskq.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/spl/spl-debug.c b/modules/spl/spl-debug.c
index d2b96b0c3..df22cbc48 100644
--- a/modules/spl/spl-debug.c
+++ b/modules/spl/spl-debug.c
@@ -1118,8 +1118,10 @@ void spl_debug_bug(char *file, const char *func, const int line, int flags)
if (spl_debug_panic_on_bug)
spl_panic_in_progress = 1;
+#ifdef DEBUG
spl_debug_dumpstack(NULL);
spl_debug_dumplog(flags);
+#endif
if (spl_debug_panic_on_bug)
panic("SBUG");
diff --git a/modules/spl/spl-taskq.c b/modules/spl/spl-taskq.c
index dc6959db5..799b54839 100644
--- a/modules/spl/spl-taskq.c
+++ b/modules/spl/spl-taskq.c
@@ -475,7 +475,7 @@ spl_taskq_init(void)
ENTRY;
system_taskq = taskq_create("system_taskq", 64, minclsyspri, 4, 512,
- TASKQ_DYNAMIC | TASKQ_PREPOPULATE);
+ TASKQ_PREPOPULATE);
if (system_taskq == NULL)
RETURN(1);