svn commit: r345014 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Alexander Motin
mav at FreeBSD.org
Mon Mar 11 17:39:10 UTC 2019
Author: mav
Date: Mon Mar 11 17:39:09 2019
New Revision: 345014
URL: https://svnweb.freebsd.org/changeset/base/345014
Log:
Revert minor part of r344934.
I tried to save some CPU time on hopeless aggregation attempts, but it seems
the condition I added is overly strict, blocking also aggregation of optional
I/Os in cases which previously were possible. Revert just to be safe.
MFC after: 1 month
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Mon Mar 11 15:47:26 2019 (r345013)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Mon Mar 11 17:39:09 2019 (r345014)
@@ -692,7 +692,7 @@ vdev_queue_aggregate(vdev_queue_t *vq, zio_t *zio)
limit = zfs_vdev_aggregation_limit;
limit = MAX(MIN(limit, maxblocksize), 0);
- if (zio->io_flags & ZIO_FLAG_DONT_AGGREGATE || zio->io_size >= limit)
+ if (zio->io_flags & ZIO_FLAG_DONT_AGGREGATE || limit == 0)
return (NULL);
first = last = zio;
More information about the svn-src-all
mailing list