[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/34] block/nbd: introduce nbd_client_connection_release()
From: |
Eric Blake |
Subject: |
[PULL 18/34] block/nbd: introduce nbd_client_connection_release() |
Date: |
Tue, 15 Jun 2021 15:47:40 -0500 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
This is a last step of creating bs-independent nbd connection
interface. With next commit we can finally move it to separate file.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210610100802.5888-17-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
block/nbd.c | 45 +++++++++++++++++++++++++++------------------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index e7261aeaef7b..fa6e5e85bd6f 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -127,7 +127,7 @@ typedef struct BDRVNBDState {
NBDClientConnection *conn;
} BDRVNBDState;
-static void nbd_free_connect_thread(NBDClientConnection *conn);
+static void nbd_client_connection_release(NBDClientConnection *conn);
static int nbd_establish_connection(BlockDriverState *bs, SocketAddress *saddr,
Error **errp);
static coroutine_fn QIOChannelSocket *
@@ -139,22 +139,9 @@ static void nbd_yank(void *opaque);
static void nbd_clear_bdrvstate(BlockDriverState *bs)
{
BDRVNBDState *s = (BDRVNBDState *)bs->opaque;
- NBDClientConnection *conn = s->conn;
- bool do_free = false;
- qemu_mutex_lock(&conn->mutex);
- assert(!conn->detached);
- if (conn->running) {
- conn->detached = true;
- } else {
- do_free = true;
- }
- qemu_mutex_unlock(&conn->mutex);
-
- /* the runaway thread will clean up itself */
- if (do_free) {
- nbd_free_connect_thread(conn);
- }
+ nbd_client_connection_release(s->conn);
+ s->conn = NULL;
yank_unregister_instance(BLOCKDEV_YANK_INSTANCE(bs->node_name));
@@ -372,7 +359,7 @@ nbd_client_connection_new(const SocketAddress *saddr)
return conn;
}
-static void nbd_free_connect_thread(NBDClientConnection *conn)
+static void nbd_client_connection_do_free(NBDClientConnection *conn)
{
if (conn->sioc) {
qio_channel_close(QIO_CHANNEL(conn->sioc), NULL);
@@ -414,12 +401,34 @@ static void *connect_thread_func(void *opaque)
qemu_mutex_unlock(&conn->mutex);
if (do_free) {
- nbd_free_connect_thread(conn);
+ nbd_client_connection_do_free(conn);
}
return NULL;
}
+static void nbd_client_connection_release(NBDClientConnection *conn)
+{
+ bool do_free = false;
+
+ if (!conn) {
+ return;
+ }
+
+ qemu_mutex_lock(&conn->mutex);
+ assert(!conn->detached);
+ if (conn->running) {
+ conn->detached = true;
+ } else {
+ do_free = true;
+ }
+ qemu_mutex_unlock(&conn->mutex);
+
+ if (do_free) {
+ nbd_client_connection_do_free(conn);
+ }
+}
+
/*
* Get a new connection in context of @conn:
* if the thread is running, wait for completion
--
2.31.1
- [PULL 06/34] block/nbd: connect_thread_func(): do qio_channel_set_delay(false), (continued)
- [PULL 06/34] block/nbd: connect_thread_func(): do qio_channel_set_delay(false), Eric Blake, 2021/06/15
- [PULL 10/34] block/nbd: nbd_client_handshake(): fix leak of s->ioc, Eric Blake, 2021/06/15
- [PULL 09/34] block/nbd: ensure ->connection_thread is always valid, Eric Blake, 2021/06/15
- [PULL 08/34] block/nbd: call socket_address_parse_named_fd() in advance, Eric Blake, 2021/06/15
- [PULL 11/34] block/nbd: BDRVNBDState: drop unused connect_err and connect_status, Eric Blake, 2021/06/15
- [PULL 12/34] block/nbd: simplify waking of nbd_co_establish_connection(), Eric Blake, 2021/06/15
- [PULL 13/34] block/nbd: drop thr->state, Eric Blake, 2021/06/15
- [PULL 14/34] block/nbd: bs-independent interface for nbd_co_establish_connection(), Eric Blake, 2021/06/15
- [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 <=
- [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, 2021/06/15
- [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