[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 26/34] block/nbd: don't touch s->sioc in nbd_teardown_connection()
From: |
Eric Blake |
Subject: |
[PULL 26/34] block/nbd: don't touch s->sioc in nbd_teardown_connection() |
Date: |
Tue, 15 Jun 2021 15:47:48 -0500 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Negotiation during reconnect is now done in a thread, and s->sioc is
not available during negotiation. Negotiation in thread will be
cancelled by nbd_client_connection_release() called from
nbd_clear_bdrvstate(). So, we don't need this code chunk anymore.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210610100802.5888-25-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
block/nbd.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index 311471644487..2abcedd464c7 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -280,10 +280,6 @@ static void nbd_teardown_connection(BlockDriverState *bs)
if (s->ioc) {
/* finish any pending coroutines */
qio_channel_shutdown(s->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL);
- } else if (s->sioc) {
- /* abort negotiation */
- qio_channel_shutdown(QIO_CHANNEL(s->sioc), QIO_CHANNEL_SHUTDOWN_BOTH,
- NULL);
}
s->state = NBD_CLIENT_QUIT;
--
2.31.1
- [PULL 15/34] block/nbd: make nbd_co_establish_connection_cancel() bs-independent, (continued)
- [PULL 15/34] block/nbd: make nbd_co_establish_connection_cancel() bs-independent, Eric Blake, 2021/06/15
- [PULL 17/34] block/nbd: introduce nbd_client_connection_new(), Eric Blake, 2021/06/15
- [PULL 18/34] block/nbd: introduce nbd_client_connection_release(), Eric Blake, 2021/06/15
- [PULL 16/34] block/nbd: rename NBDConnectThread to NBDClientConnection, Eric Blake, 2021/06/15
- [PULL 22/34] nbd/client-connection: implement connection retry, Eric Blake, 2021/06/15
- [PULL 20/34] nbd/client-connection: use QEMU_LOCK_GUARD, Eric Blake, 2021/06/15
- [PULL 21/34] nbd/client-connection: add possibility of negotiation, Eric Blake, 2021/06/15
- [PULL 19/34] nbd: move connection code from block/nbd to nbd/client-connection, Eric Blake, 2021/06/15
- [PULL 23/34] nbd/client-connection: shutdown connection on release, Eric Blake, 2021/06/15
- [PULL 25/34] block/nbd: use negotiation of NBDClientConnection, Eric Blake, 2021/06/15
- [PULL 26/34] block/nbd: don't touch s->sioc in nbd_teardown_connection(),
Eric Blake <=
- [PULL 24/34] block/nbd: split nbd_handle_updated_info out of nbd_client_handshake(), Eric Blake, 2021/06/15
- [PULL 27/34] block/nbd: drop BDRVNBDState::sioc, Eric Blake, 2021/06/15
- [PULL 30/34] block/nbd: split nbd_co_do_establish_connection out of nbd_reconnect_attempt, Eric Blake, 2021/06/15
- [PULL 28/34] nbd/client-connection: return only one io channel, Eric Blake, 2021/06/15
- [PULL 31/34] nbd/client-connection: add option for non-blocking connection attempt, Eric Blake, 2021/06/15
- [PULL 29/34] block-coroutine-wrapper: allow non bdrv_ prefix, Eric Blake, 2021/06/15
- [PULL 33/34] block/nbd: add nbd_client_connected() helper, Eric Blake, 2021/06/15
- [PULL 32/34] block/nbd: reuse nbd_co_do_establish_connection() in nbd_open(), Eric Blake, 2021/06/15