[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/9] block/nbd-client: refactor nbd_co_receive_reply
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PULL 3/9] block/nbd-client: refactor nbd_co_receive_reply |
Date: |
Sat, 14 Oct 2017 19:40:27 -0500 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Pass handle parameter directly, as the whole request isn't needed.
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 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/block/nbd-client.c b/block/nbd-client.c
index ddf273a6a4..c0683c3c83 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -180,11 +180,11 @@ err:
}
static int nbd_co_receive_reply(NBDClientSession *s,
- NBDRequest *request,
+ uint64_t handle,
QEMUIOVector *qiov)
{
int ret;
- int i = HANDLE_TO_INDEX(s, request->handle);
+ int i = HANDLE_TO_INDEX(s, handle);
/* Wait until we're woken up by nbd_read_reply_entry. */
s->requests[i].receiving = true;
@@ -193,7 +193,7 @@ static int nbd_co_receive_reply(NBDClientSession *s,
if (!s->ioc || s->quit) {
ret = -EIO;
} else {
- assert(s->reply.handle == request->handle);
+ assert(s->reply.handle == handle);
ret = -s->reply.error;
if (qiov && s->reply.error == 0) {
if (qio_channel_readv_all(s->ioc, qiov->iov, qiov->niov,
@@ -241,7 +241,7 @@ static int nbd_co_request(BlockDriverState *bs,
return ret;
}
- return nbd_co_receive_reply(client, request,
+ return nbd_co_receive_reply(client, request->handle,
request->type == NBD_CMD_READ ? qiov : NULL);
}
--
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, 2017/10/14
- [Qemu-devel] [PULL 3/9] block/nbd-client: refactor nbd_co_receive_reply,
Eric Blake <=
- [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