X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fvdev_queue.c;h=e2096fac9d63d70397468fbd85bfa8f5617ea98e;hb=ff80d9b142826c15fa84e3c4b9ef1795fd6e9485;hp=7ba638952e10df8e52fcd4bb84e4583b8dd84df3;hpb=86dd0fd9222b6103c6533036c47b908ece944460;p=zfs.git

diff --git a/module/zfs/vdev_queue.c b/module/zfs/vdev_queue.c
index 7ba6389..e2096fa 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,