c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 03:09:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Limit zfs_vdev_aggregation_limit to SPA_MAXBLOCKSIZE

Browse Source 
Prevent users from setting the zfs_vdev_aggregation_limit tuning
larger than SPA_MAXBLOCKSIZE.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #520
This commit is contained in:
Brian Behlendorf 2012-10-15 09:27:48 -07:00
parent 45ca2d91cb
commit c418410393
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/zfs/vdev_queue.c
View File

@ -201,7 +201,7 @@ vdev_queue_io_to_issue(vdev_queue_t *vq, uint64_t pending_limit)
avl_tree_t *t; avl_tree_t *t;
vdev_io_t *vi; vdev_io_t *vi;
int flags; int flags;
uint64_t maxspan = zfs_vdev_aggregation_limit; uint64_t maxspan = MIN(zfs_vdev_aggregation_limit, SPA_MAXBLOCKSIZE);
uint64_t maxgap; uint64_t maxgap;
int stretch; int stretch;
@ -312,7 +312,7 @@ again:
if (fio != lio) { if (fio != lio) {
uint64_t size = IO_SPAN(fio, lio); uint64_t size = IO_SPAN(fio, lio);
ASSERT(size <= zfs_vdev_aggregation_limit); ASSERT(size <= maxspan);
ASSERT(vi != NULL); ASSERT(vi != NULL);
aio = zio_vdev_delegated_io(fio->io_vd, fio->io_offset, aio = zio_vdev_delegated_io(fio->io_vd, fio->io_offset,