From 58b2de6420abfc60abcb280f82521a01ff8422af Mon Sep 17 00:00:00 2001
From: DeHackEd <DeHackEd@users.noreply.github.com>
Date: Mon, 3 Jun 2019 23:54:43 -0400
Subject: [PATCH] Wait in 'S' state when send/recv pipe is blocking

Reviewed-by: Paul Dagnelie <pcd@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: DHE <git@dehacked.net>
Closes #8733
Closes #8752
---
 module/zfs/bqueue.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/zfs/bqueue.c b/module/zfs/bqueue.c
index f30253d24b..3fc7fcaaad 100644
--- a/module/zfs/bqueue.c
+++ b/module/zfs/bqueue.c
@@ -73,7 +73,7 @@ bqueue_enqueue(bqueue_t *q, void *data, uint64_t item_size)
 	mutex_enter(&q->bq_lock);
 	obj2node(q, data)->bqn_size = item_size;
 	while (q->bq_size + item_size > q->bq_maxsize) {
-		cv_wait(&q->bq_add_cv, &q->bq_lock);
+		cv_wait_sig(&q->bq_add_cv, &q->bq_lock);
 	}
 	q->bq_size += item_size;
 	list_insert_tail(&q->bq_list, data);
@@ -91,7 +91,7 @@ bqueue_dequeue(bqueue_t *q)
 	uint64_t item_size;
 	mutex_enter(&q->bq_lock);
 	while (q->bq_size == 0) {
-		cv_wait(&q->bq_pop_cv, &q->bq_lock);
+		cv_wait_sig(&q->bq_pop_cv, &q->bq_lock);
 	}
 	ret = list_remove_head(&q->bq_list);
 	ASSERT3P(ret, !=, NULL);