mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-14 23:13:30 +00:00
block/nbd-client: refactor nbd_co_receive_reply
Pass handle parameter directly, as the whole request isn't needed. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20171012095319.136610-3-vsementsov@virtuozzo.com> Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
4bfe4478d1
commit
ed397b2fe7
|
@ -180,11 +180,11 @@ err:
|
||||||
}
|
}
|
||||||
|
|
||||||
static int nbd_co_receive_reply(NBDClientSession *s,
|
static int nbd_co_receive_reply(NBDClientSession *s,
|
||||||
NBDRequest *request,
|
uint64_t handle,
|
||||||
QEMUIOVector *qiov)
|
QEMUIOVector *qiov)
|
||||||
{
|
{
|
||||||
int ret;
|
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. */
|
/* Wait until we're woken up by nbd_read_reply_entry. */
|
||||||
s->requests[i].receiving = true;
|
s->requests[i].receiving = true;
|
||||||
|
@ -193,7 +193,7 @@ static int nbd_co_receive_reply(NBDClientSession *s,
|
||||||
if (!s->ioc || s->quit) {
|
if (!s->ioc || s->quit) {
|
||||||
ret = -EIO;
|
ret = -EIO;
|
||||||
} else {
|
} else {
|
||||||
assert(s->reply.handle == request->handle);
|
assert(s->reply.handle == handle);
|
||||||
ret = -s->reply.error;
|
ret = -s->reply.error;
|
||||||
if (qiov && s->reply.error == 0) {
|
if (qiov && s->reply.error == 0) {
|
||||||
if (qio_channel_readv_all(s->ioc, qiov->iov, qiov->niov,
|
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 ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
return nbd_co_receive_reply(client, request,
|
return nbd_co_receive_reply(client, request->handle,
|
||||||
request->type == NBD_CMD_READ ? qiov : NULL);
|
request->type == NBD_CMD_READ ? qiov : NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue