diff options
| author | John Snow <jsnow@redhat.com> | 2016-06-22 15:51:03 -0400 |
|---|---|---|
| committer | Jeff Cody <jcody@redhat.com> | 2016-06-28 22:53:03 -0400 |
| commit | e4808881cbbe8ee9b587a49dd5fabd88375affd6 (patch) | |
| tree | fbb6f83e911480809b5315b1e90ba3a03a73bb2f | |
| parent | 176129552f78bcb99022036d3293c6593c9716c3 (diff) | |
mirror: limit niov to IOV_MAX elements, again
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 <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-id: 1466625064-11280-3-git-send-email-jsnow@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
| -rw-r--r-- | block/mirror.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/block/mirror.c b/block/mirror.c index 42ebc3b9e9..5bac906d82 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; |