Skip to content

Commit

Permalink
Illumos #1557 assertion failed in userland taskq_destroy()
Browse files Browse the repository at this point in the history
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@aa846ad
  illumos changeset: 13597:3eac1e8e0f4c
  https://www.illumos.org/issues/1557

Ported-by: Brian Behlendorf <[email protected]>
  • Loading branch information
gdamore authored and behlendorf committed Jan 11, 2013
1 parent 5c83989 commit 844793c
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions lib/libzpool/taskq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 844793c

Please sign in to comment.