[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 5/5] block/nbd-client: don't check ioc
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH 5/5] block/nbd-client: don't check ioc |
Date: |
Mon, 7 May 2018 18:44:58 +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.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/nbd-client.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/block/nbd-client.c b/block/nbd-client.c
index dd712c59b3..87d90d9026 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -51,10 +51,6 @@ static void nbd_teardown_connection(BlockDriverState *bs)
{
NBDClientSession *client = nbd_get_client_session(bs);
- if (!client->ioc) { /* Already closed */
- return;
- }
-
/* finish any pending coroutines */
qio_channel_shutdown(client->ioc,
QIO_CHANNEL_SHUTDOWN_BOTH,
@@ -150,10 +146,6 @@ static int nbd_co_send_request(BlockDriverState *bs,
rc = -EIO;
goto err;
}
- if (!s->ioc) {
- rc = -EPIPE;
- goto err;
- }
if (qiov) {
qio_channel_set_cork(s->ioc, true);
@@ -426,7 +418,7 @@ 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;
}
@@ -967,10 +959,6 @@ void nbd_client_close(BlockDriverState *bs)
NBDClientSession *client = nbd_get_client_session(bs);
NBDRequest request = { .type = NBD_CMD_DISC };
- if (client->ioc == NULL) {
- return;
- }
-
nbd_send_request(client->ioc, &request);
nbd_teardown_connection(bs);
--
2.11.1
- [Qemu-block] [PATCH 0/5] NBD reconnect: preliminary refactoring, Vladimir Sementsov-Ogievskiy, 2018/05/07
- [Qemu-block] [PATCH 3/5] block/nbd-client: split connection from initialization, Vladimir Sementsov-Ogievskiy, 2018/05/07
- [Qemu-block] [PATCH 1/5] block/nbd-client: split channel errors from export errors, Vladimir Sementsov-Ogievskiy, 2018/05/07
- [Qemu-block] [PATCH 5/5] block/nbd-client: don't check ioc,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH 4/5] block/nbd-client: fix nbd_reply_chunk_iter_receive, Vladimir Sementsov-Ogievskiy, 2018/05/07
- [Qemu-block] [PATCH 2/5] block/nbd: move connection code from block/nbd to block/nbd-client, Vladimir Sementsov-Ogievskiy, 2018/05/07
- Re: [Qemu-block] [PATCH 0/5] NBD reconnect: preliminary refactoring, Vladimir Sementsov-Ogievskiy, 2018/05/17