[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/9] block/nbd-client: assert qiov len once in nbd_co
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PULL 2/9] block/nbd-client: assert qiov len once in nbd_co_request |
Date: |
Sat, 14 Oct 2017 19:40:26 -0500 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Also improve the assertion: check that qiov is NULL for other commands
than CMD_READ and CMD_WRITE.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
---
block/nbd-client.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/block/nbd-client.c b/block/nbd-client.c
index 72651dcdb1..ddf273a6a4 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;
@@ -231,8 +229,12 @@ static int nbd_co_request(BlockDriverState *bs,
NBDClientSession *client = nbd_get_client_session(bs);
int ret;
- assert(!qiov || request->type == NBD_CMD_WRITE ||
- request->type == NBD_CMD_READ);
+ if (qiov) {
+ assert(request->type == NBD_CMD_WRITE || request->type ==
NBD_CMD_READ);
+ assert(request->len == iov_size(qiov->iov, qiov->niov));
+ } else {
+ assert(request->type != NBD_CMD_WRITE && request->type !=
NBD_CMD_READ);
+ }
ret = nbd_co_send_request(bs, request,
request->type == NBD_CMD_WRITE ? qiov : NULL);
if (ret < 0) {
--
2.13.6
- [Qemu-devel] [PULL 0/9] NBD patches through 14 Oct, Eric Blake, 2017/10/14
- [Qemu-devel] [PULL 1/9] NBD: use g_new() family of functions, Eric Blake, 2017/10/14
- [Qemu-devel] [PULL 2/9] block/nbd-client: assert qiov len once in nbd_co_request,
Eric Blake <=
- [Qemu-devel] [PULL 3/9] block/nbd-client: refactor nbd_co_receive_reply, Eric Blake, 2017/10/14
- [Qemu-devel] [PULL 4/9] nbd: rename some simple-request related objects to be _simple_, Eric Blake, 2017/10/14
- [Qemu-devel] [PULL 5/9] nbd/server: structurize simple reply header sending, Eric Blake, 2017/10/14
- [Qemu-devel] [PULL 7/9] nbd/server: refactor nbd_co_send_simple_reply parameters, Eric Blake, 2017/10/14
- [Qemu-devel] [PULL 6/9] nbd/server: do not use NBDReply structure, Eric Blake, 2017/10/14
- [Qemu-devel] [PULL 8/9] nbd/server: simplify reply transmission, Eric Blake, 2017/10/14
- [Qemu-devel] [PULL 9/9] nbd: header constants indenting, Eric Blake, 2017/10/14
- Re: [Qemu-devel] [PULL 0/9] NBD patches through 14 Oct, Peter Maydell, 2017/10/16