[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 1/8] block/nbd-client: assert qiov len once in nbd_c
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH 1/8] block/nbd-client: assert qiov len once in nbd_co_request |
Date: |
Mon, 25 Sep 2017 16:57:54 +0300 |
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/nbd-client.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/block/nbd-client.c b/block/nbd-client.c
index 9d1e154feb..88fd10270e 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -156,7 +156,6 @@ static int nbd_co_send_request(BlockDriverState *bs,
qio_channel_set_cork(s->ioc, true);
rc = nbd_send_request(s->ioc, request);
if (rc >= 0 && !s->quit) {
- assert(request->len == iov_size(qiov->iov, qiov->niov));
if (qio_channel_writev_all(s->ioc, qiov->iov, qiov->niov,
NULL) < 0) {
rc = -EIO;
@@ -197,7 +196,6 @@ static int nbd_co_receive_reply(NBDClientSession *s,
assert(s->reply.handle == request->handle);
ret = -s->reply.error;
if (qiov && s->reply.error == 0) {
- assert(request->len == iov_size(qiov->iov, qiov->niov));
if (qio_channel_readv_all(s->ioc, qiov->iov, qiov->niov,
NULL) < 0) {
ret = -EIO;
@@ -233,6 +231,7 @@ static int nbd_co_request(BlockDriverState *bs,
assert(!qiov || request->type == NBD_CMD_WRITE ||
request->type == NBD_CMD_READ);
+ assert(!qiov || request->len == iov_size(qiov->iov, qiov->niov));
ret = nbd_co_send_request(bs, request,
request->type == NBD_CMD_WRITE ? qiov : NULL);
if (ret < 0) {
--
2.11.1
- Re: [Qemu-block] [PATCH 2/8] block/nbd-client: refactor nbd_co_receive_reply, (continued)
[Qemu-block] [PATCH 5/8] nbd: header constants indenting, Vladimir Sementsov-Ogievskiy, 2017/09/25
[Qemu-block] [PATCH 4/8] nbd-server: refactor simple reply sending, Vladimir Sementsov-Ogievskiy, 2017/09/25
[Qemu-block] [PATCH 1/8] block/nbd-client: assert qiov len once in nbd_co_request,
Vladimir Sementsov-Ogievskiy <=
Re: [Qemu-block] [PATCH 0/8] nbd minimal structured read, Vladimir Sementsov-Ogievskiy, 2017/09/25