git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the bio_empty_barrier() check.
[zfs.git]
/
module
/
zfs
/
vdev_queue.c
diff --git
a/module/zfs/vdev_queue.c
b/module/zfs/vdev_queue.c
index
7ba6389
..
e2096fa
100644
(file)
--- 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;
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;
uint64_t maxgap;
int stretch;
@@
-312,7
+312,7
@@
again:
if (fio != lio) {
uint64_t size = IO_SPAN(fio, lio);
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,
ASSERT(vi != NULL);
aio = zio_vdev_delegated_io(fio->io_vd, fio->io_offset,