]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Allow 16M send/recv blocks
authorBrian Behlendorf <behlendorf1@llnl.gov>
Sat, 9 Jan 2016 00:21:56 +0000 (19:21 -0500)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Sat, 9 Jan 2016 01:23:23 +0000 (20:23 -0500)
Fix an off by one error introduced by fcff0f3 which triggers an
assertion when 16M blocks are used with send/recv.  This fix was
intentionally not folder in to the Illumos commit so it can be
easily cherry-picked by upstream.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
module/zfs/bqueue.c

index 1ddc697b5424a67b51886142764f1f03ea58ae1d..89655cf538b48f6da730382013b1bb4414725526 100644 (file)
@@ -69,7 +69,7 @@ void
 bqueue_enqueue(bqueue_t *q, void *data, uint64_t item_size)
 {
        ASSERT3U(item_size, >, 0);
-       ASSERT3U(item_size, <, q->bq_maxsize);
+       ASSERT3U(item_size, <=, q->bq_maxsize);
        mutex_enter(&q->bq_lock);
        obj2node(q, data)->bqn_size = item_size;
        while (q->bq_size + item_size > q->bq_maxsize) {