[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 05/11] block/nbd-client: don't check ioc
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH v2 05/11] block/nbd-client: don't check ioc |
Date: |
Thu, 7 Jun 2018 20:14:35 +0300 |
We have several paranoiac checks for ioc != NULL. But ioc may become
NULL only on close, which should not happen during requests handling.
Also, we check ioc only sometimes, not after each yield, which is
inconsistent. Let's drop these checks. However, for safety, lets leave
asserts instead.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/nbd-client.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/block/nbd-client.c b/block/nbd-client.c
index dd712c59b3..1589ceb475 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -51,9 +51,7 @@ static void nbd_teardown_connection(BlockDriverState *bs)
{
NBDClientSession *client = nbd_get_client_session(bs);
- if (!client->ioc) { /* Already closed */
- return;
- }
+ assert(client->ioc);
/* finish any pending coroutines */
qio_channel_shutdown(client->ioc,
@@ -150,10 +148,7 @@ static int nbd_co_send_request(BlockDriverState *bs,
rc = -EIO;
goto err;
}
- if (!s->ioc) {
- rc = -EPIPE;
- goto err;
- }
+ assert(s->ioc);
if (qiov) {
qio_channel_set_cork(s->ioc, true);
@@ -426,10 +421,11 @@ static coroutine_fn int nbd_co_do_receive_one_chunk(
s->requests[i].receiving = true;
qemu_coroutine_yield();
s->requests[i].receiving = false;
- if (!s->ioc || s->quit) {
+ if (s->quit) {
error_setg(errp, "Connection closed");
return -EIO;
}
+ assert(s->ioc);
assert(s->reply.handle == handle);
@@ -967,9 +963,7 @@ void nbd_client_close(BlockDriverState *bs)
NBDClientSession *client = nbd_get_client_session(bs);
NBDRequest request = { .type = NBD_CMD_DISC };
- if (client->ioc == NULL) {
- return;
- }
+ assert(client->ioc);
nbd_send_request(client->ioc, &request);
--
2.11.1
- [Qemu-block] [PATCH v2 00/11] NBD reconnect, Vladimir Sementsov-Ogievskiy, 2018/06/07
- [Qemu-block] [PATCH v2 09/11] block/nbd: add cmdline and qapi parameters for nbd reconnect, Vladimir Sementsov-Ogievskiy, 2018/06/07
- [Qemu-block] [PATCH v2 06/11] block/nbd-client: move from quit to state, Vladimir Sementsov-Ogievskiy, 2018/06/07
- [Qemu-block] [PATCH v2 04/11] block/nbd-client: fix nbd_reply_chunk_iter_receive, Vladimir Sementsov-Ogievskiy, 2018/06/07
- [Qemu-block] [PATCH v2 03/11] block/nbd-client: split connection from initialization, Vladimir Sementsov-Ogievskiy, 2018/06/07
- [Qemu-block] [PATCH v2 05/11] block/nbd-client: don't check ioc,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH v2 07/11] block/nbd-client: rename read_reply_co to connection_co, Vladimir Sementsov-Ogievskiy, 2018/06/07
- [Qemu-block] [PATCH v2 08/11] block/nbd-client: move connecting to connection_co, Vladimir Sementsov-Ogievskiy, 2018/06/07
- [Qemu-block] [PATCH v2 02/11] block/nbd: move connection code from block/nbd to block/nbd-client, Vladimir Sementsov-Ogievskiy, 2018/06/07
- [Qemu-block] [PATCH v2 01/11] block/nbd-client: split channel errors from export errors, Vladimir Sementsov-Ogievskiy, 2018/06/07
- [Qemu-block] [PATCH v2 11/11] iotests: test nbd reconnect, Vladimir Sementsov-Ogievskiy, 2018/06/07
- [Qemu-block] [PATCH v2 10/11] block/nbd-client: nbd reconnect, Vladimir Sementsov-Ogievskiy, 2018/06/07
- Re: [Qemu-block] [Qemu-devel] [PATCH v2 00/11] NBD reconnect, no-reply, 2018/06/07
- Re: [Qemu-block] [Qemu-devel] [PATCH v2 00/11] NBD reconnect, no-reply, 2018/06/07