[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/3] mirror: limit niov to IOV_MAX elements, again
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH 2/3] mirror: limit niov to IOV_MAX elements, again |
Date: |
Wed, 22 Jun 2016 15:51:03 -0400 |
During the refactor of mirror_iteration in e5b43573,
we regressed the fix introduced in cae98cb8.
This patch re-adds IOV_MAX checking to cases where we
aren't checking alignment (and size) already.
Signed-off-by: John Snow <address@hidden>
---
block/mirror.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/block/mirror.c b/block/mirror.c
index 2ba9642..377339d 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -231,11 +231,14 @@ static int mirror_do_read(MirrorBlockJob *s, int64_t
sector_num,
int sectors_per_chunk, nb_chunks;
int ret;
MirrorOp *op;
+ int max_sectors;
sectors_per_chunk = s->granularity >> BDRV_SECTOR_BITS;
+ max_sectors = sectors_per_chunk * s->max_iov;
/* We can only handle as much as buf_size at a time. */
nb_sectors = MIN(s->buf_size >> BDRV_SECTOR_BITS, nb_sectors);
+ nb_sectors = MIN(max_sectors, nb_sectors);
assert(nb_sectors);
ret = nb_sectors;
--
2.4.11
- [Qemu-devel] [PATCH 0/3] drive-mirror: limit niov to MAX_IOV, John Snow, 2016/06/22
- [Qemu-devel] [PATCH 1/3] mirror: clarify mirror_do_read return code, John Snow, 2016/06/22
- [Qemu-devel] [PATCH 3/3] iotests: add small-granularity mirror test, John Snow, 2016/06/22
- [Qemu-devel] [PATCH 2/3] mirror: limit niov to IOV_MAX elements, again,
John Snow <=
- Re: [Qemu-devel] [PATCH 0/3] drive-mirror: limit niov to MAX_IOV, John Snow, 2016/06/28
- Re: [Qemu-devel] [PATCH 0/3] drive-mirror: limit niov to MAX_IOV, Jeff Cody, 2016/06/28