[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/20] block/nbd: move nbd_recv_coroutines_wake_all() up
From: |
Eric Blake |
Subject: |
[PULL 16/20] block/nbd: move nbd_recv_coroutines_wake_all() up |
Date: |
Mon, 27 Sep 2021 16:55:41 -0500 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
We are going to use it in nbd_channel_error(), so move it up. Note,
that we are going also refactor and rename
nbd_recv_coroutines_wake_all() in future anyway, so keeping it where it
is and making forward declaration doesn't make real sense.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210902103805.25686-3-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
block/nbd.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index de59e76378ab..2842e6263fe4 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -127,22 +127,6 @@ static bool nbd_client_connected(BDRVNBDState *s)
return qatomic_load_acquire(&s->state) == NBD_CLIENT_CONNECTED;
}
-static void nbd_channel_error(BDRVNBDState *s, int ret)
-{
- if (nbd_client_connected(s)) {
- qio_channel_shutdown(s->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL);
- }
-
- if (ret == -EIO) {
- if (nbd_client_connected(s)) {
- s->state = s->reconnect_delay ? NBD_CLIENT_CONNECTING_WAIT :
- NBD_CLIENT_CONNECTING_NOWAIT;
- }
- } else {
- s->state = NBD_CLIENT_QUIT;
- }
-}
-
static void nbd_recv_coroutines_wake_all(BDRVNBDState *s)
{
int i;
@@ -157,6 +141,22 @@ static void nbd_recv_coroutines_wake_all(BDRVNBDState *s)
}
}
+static void nbd_channel_error(BDRVNBDState *s, int ret)
+{
+ if (nbd_client_connected(s)) {
+ qio_channel_shutdown(s->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL);
+ }
+
+ if (ret == -EIO) {
+ if (nbd_client_connected(s)) {
+ s->state = s->reconnect_delay ? NBD_CLIENT_CONNECTING_WAIT :
+ NBD_CLIENT_CONNECTING_NOWAIT;
+ }
+ } else {
+ s->state = NBD_CLIENT_QUIT;
+ }
+}
+
static void reconnect_delay_timer_del(BDRVNBDState *s)
{
if (s->reconnect_delay_timer) {
--
2.31.1
- [PULL 04/20] block: use int64_t instead of uint64_t in driver read handlers, (continued)
- [PULL 04/20] block: use int64_t instead of uint64_t in driver read handlers, Eric Blake, 2021/09/27
- [PULL 07/20] block: make BlockLimits::max_pwrite_zeroes 64bit, Eric Blake, 2021/09/27
- [PULL 09/20] block/io: allow 64bit write-zeroes requests, Eric Blake, 2021/09/27
- [PULL 12/20] block/io: allow 64bit discard requests, Eric Blake, 2021/09/27
- [PULL 13/20] nbd/server: Allow LIST_META_CONTEXT without STRUCTURED_REPLY, Eric Blake, 2021/09/27
- [PULL 15/20] block/nbd: nbd_channel_error() shutdown channel unconditionally, Eric Blake, 2021/09/27
- [PULL 18/20] block/nbd: drop connection_co, Eric Blake, 2021/09/27
- [PULL 17/20] block/nbd: refactor nbd_recv_coroutines_wake_all(), Eric Blake, 2021/09/27
- [PULL 08/20] block: use int64_t instead of int in driver write_zeroes handlers, Eric Blake, 2021/09/27
- [PULL 14/20] nbd/client-connection: nbd_co_establish_connection(): fix non set errp, Eric Blake, 2021/09/27
- [PULL 16/20] block/nbd: move nbd_recv_coroutines_wake_all() up,
Eric Blake <=
- [PULL 19/20] block/nbd: check that received handle is valid, Eric Blake, 2021/09/27
- [PULL 20/20] nbd/server: Add --selinux-label option, Eric Blake, 2021/09/27
- Re: [PULL 00/20] NBD patches through 2021-09-27, Peter Maydell, 2021/09/29
- Re: [PULL 00/20] NBD patches through 2021-09-27, Paolo Bonzini, 2021/09/29
- Re: [PULL 00/20] NBD patches through 2021-09-27, Richard Henderson, 2021/09/29
- Re: [PULL 00/20] NBD patches through 2021-09-27, Paolo Bonzini, 2021/09/29
- Re: [PULL 00/20] NBD patches through 2021-09-27, Eric Blake, 2021/09/29
- Re: [PULL 00/20] NBD patches through 2021-09-27, Richard W.M. Jones, 2021/09/29
- Re: [PULL 00/20] NBD patches through 2021-09-27, Daniel P . Berrangé, 2021/09/30
- Re: [PULL 00/20] NBD patches through 2021-09-27, Richard W.M. Jones, 2021/09/30