From c418410393325eb01be5b6cc5ff0e6e8aa24af93 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 15 Oct 2012 09:27:48 -0700 Subject: [PATCH] Limit zfs_vdev_aggregation_limit to SPA_MAXBLOCKSIZE Prevent users from setting the zfs_vdev_aggregation_limit tuning larger than SPA_MAXBLOCKSIZE. Signed-off-by: Brian Behlendorf Closes #520 --- module/zfs/vdev_queue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/zfs/vdev_queue.c b/module/zfs/vdev_queue.c index 7ba638952..e2096fac9 100644 --- a/module/zfs/vdev_queue.c +++ b/module/zfs/vdev_queue.c @@ -201,7 +201,7 @@ vdev_queue_io_to_issue(vdev_queue_t *vq, uint64_t pending_limit) avl_tree_t *t; vdev_io_t *vi; int flags; - uint64_t maxspan = zfs_vdev_aggregation_limit; + uint64_t maxspan = MIN(zfs_vdev_aggregation_limit, SPA_MAXBLOCKSIZE); uint64_t maxgap; int stretch; @@ -312,7 +312,7 @@ again: if (fio != lio) { uint64_t size = IO_SPAN(fio, lio); - ASSERT(size <= zfs_vdev_aggregation_limit); + ASSERT(size <= maxspan); ASSERT(vi != NULL); aio = zio_vdev_delegated_io(fio->io_vd, fio->io_offset, -- 2.40.0