summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--module/zfs/bqueue.c2
-rw-r--r--tests/runfiles/linux.run3
2 files changed, 2 insertions, 3 deletions
diff --git a/module/zfs/bqueue.c b/module/zfs/bqueue.c
index 0e490805c..f30253d24 100644
--- a/module/zfs/bqueue.c
+++ b/module/zfs/bqueue.c
@@ -97,8 +97,8 @@ bqueue_dequeue(bqueue_t *q)
ASSERT3P(ret, !=, NULL);
item_size = obj2node(q, ret)->bqn_size;
q->bq_size -= item_size;
- mutex_exit(&q->bq_lock);
cv_signal(&q->bq_add_cv);
+ mutex_exit(&q->bq_lock);
return (ret);
}
diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run
index a0d89f277..e10ec4dc2 100644
--- a/tests/runfiles/linux.run
+++ b/tests/runfiles/linux.run
@@ -482,10 +482,9 @@ tests = ['reservation_001_pos', 'reservation_002_pos', 'reservation_003_pos',
tests = ['rootpool_002_neg', 'rootpool_003_neg', 'rootpool_007_pos']
# rsend_008_pos - https://github.com/zfsonlinux/zfs/issues/6066
-# rsend_009_pos - https://github.com/zfsonlinux/zfs/issues/5887
[tests/functional/rsend]
tests = ['rsend_001_pos', 'rsend_002_pos', 'rsend_003_pos', 'rsend_004_pos',
- 'rsend_005_pos', 'rsend_006_pos', 'rsend_007_pos',
+ 'rsend_005_pos', 'rsend_006_pos', 'rsend_007_pos', 'rsend_009_pos',
'rsend_010_pos', 'rsend_011_pos', 'rsend_012_pos',
'rsend_013_pos', 'rsend_014_pos',
'rsend_019_pos', 'rsend_020_pos',