diff options
| author | Garrett D'Amore <[email protected]> | 2013-01-11 09:04:23 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-01-11 09:17:06 -0800 |
| commit | 844793c3cc6ebf8e850057e41497089131569be0 (patch) | |
| tree | a585959b44d97a90591bf7976c38962b207ab763 /lib/libzpool | |
| parent | 5c839890712c216aa657d8e3f5a25dca1469157d (diff) | |
Illumos #1557 assertion failed in userland taskq_destroy()
1557 assertion failed in userland taskq_destroy()
Reviewed by: Richard Lowe <[email protected]>
Reviewed by: George Wilson <[email protected]>
Approved by: Eric Schrock <[email protected]>
References:
illumos/illumos-gate@aa846ad9bc4785806bb6263657698d5890afbc08
illumos changeset: 13597:3eac1e8e0f4c
https://www.illumos.org/issues/1557
Ported-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'lib/libzpool')
| -rw-r--r-- | lib/libzpool/taskq.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/libzpool/taskq.c b/lib/libzpool/taskq.c index 6143a9189..803f7dc37 100644 --- a/lib/libzpool/taskq.c +++ b/lib/libzpool/taskq.c @@ -24,6 +24,7 @@ */ /* * Copyright 2011 Nexenta Systems, Inc. All rights reserved. + * Copyright 2012 Garrett D'Amore <[email protected]>. All rights reserved. */ #include <sys/zfs_context.h> @@ -140,9 +141,7 @@ taskq_dispatch(taskq_t *tq, task_func_t func, void *arg, uint_t tqflags) t->tqent_prev->tqent_next = t; t->tqent_func = func; t->tqent_arg = arg; - - ASSERT(!(t->tqent_flags & TQENT_FLAG_PREALLOC)); - + t->tqent_flags = 0; cv_signal(&tq->tq_dispatch_cv); mutex_exit(&tq->tq_lock); return (1); |