Fix taskq_wait_outstanding re-evaluate tq_next_id

wait_event is a macro, so the current implementation will cause re- evaluation of tq_next_id every time it wakes up. This would cause taskq_wait_outstanding(tq, 0) to be equivalent to taskq_wait(tq) Signed-off-by: Chunwei Chen <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Signed-off-by: Tim Chase <[email protected]> Issue openzfs#553
rtvd · May 24, 2016 · b3a22a0 · b3a22a0
1 parent 5ce028b
commit b3a22a0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/module/spl/spl-taskq.c b/module/spl/spl-taskq.c
@@ -447,8 +447,8 @@ taskq_wait_outstanding_check(taskq_t *tq, taskqid_t id)
 void
 taskq_wait_outstanding(taskq_t *tq, taskqid_t id)
 {
- wait_event(tq->tq_wait_waitq,
-  taskq_wait_outstanding_check(tq, id ? id : tq->tq_next_id - 1));
+ id = id ? id : tq->tq_next_id - 1;
+ wait_event(tq->tq_wait_waitq, taskq_wait_outstanding_check(tq, id));
 }
 EXPORT_SYMBOL(taskq_wait_outstanding);