From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, mreitz@redhat.com, kwolf@redhat.com,
vsementsov@virtuozzo.com, eblake@redhat.com
Subject: [PATCH v5 2/5] block/nbd: move nbd_recv_coroutines_wake_all() up
Date: Wed, 14 Jul 2021 19:59:13 +0300 [thread overview]
Message-ID: <20210714165916.102363-3-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210714165916.102363-1-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>
---
block/nbd.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index d88f4b954c..32e3826ba2 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -127,6 +127,20 @@ static bool nbd_client_connected(BDRVNBDState *s)
return qatomic_load_acquire(&s->state) == NBD_CLIENT_CONNECTED;
}
+static void nbd_recv_coroutines_wake_all(BDRVNBDState *s)
+{
+ int i;
+
+ for (i = 0; i < MAX_NBD_REQUESTS; i++) {
+ NBDClientRequest *req = &s->requests[i];
+
+ if (req->coroutine && req->receiving) {
+ req->receiving = false;
+ aio_co_wake(req->coroutine);
+ }
+ }
+}
+
static void nbd_channel_error(BDRVNBDState *s, int ret)
{
if (nbd_client_connected(s)) {
@@ -143,20 +157,6 @@ static void nbd_channel_error(BDRVNBDState *s, int ret)
}
}
-static void nbd_recv_coroutines_wake_all(BDRVNBDState *s)
-{
- int i;
-
- for (i = 0; i < MAX_NBD_REQUESTS; i++) {
- NBDClientRequest *req = &s->requests[i];
-
- if (req->coroutine && req->receiving) {
- req->receiving = false;
- aio_co_wake(req->coroutine);
- }
- }
-}
-
static void reconnect_delay_timer_del(BDRVNBDState *s)
{
if (s->reconnect_delay_timer) {
--
2.29.2
next prev parent reply other threads:[~2021-07-14 17:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 16:59 [PATCH v5 0/5] block/nbd: drop connection_co Vladimir Sementsov-Ogievskiy
2021-07-14 16:59 ` [PATCH v5 1/5] block/nbd: nbd_channel_error() shutdown channel unconditionally Vladimir Sementsov-Ogievskiy
2021-07-16 20:34 ` Eric Blake
2021-07-14 16:59 ` Vladimir Sementsov-Ogievskiy [this message]
2021-07-16 20:35 ` [PATCH v5 2/5] block/nbd: move nbd_recv_coroutines_wake_all() up Eric Blake
2021-07-14 16:59 ` [PATCH v5 3/5] block/nbd: refactor nbd_recv_coroutines_wake_all() Vladimir Sementsov-Ogievskiy
2021-07-16 21:25 ` Eric Blake
2021-07-19 9:13 ` Vladimir Sementsov-Ogievskiy
2021-07-14 16:59 ` [PATCH v5 4/5] block/nbd: drop connection_co Vladimir Sementsov-Ogievskiy
2021-07-14 17:07 ` Vladimir Sementsov-Ogievskiy
2021-07-14 16:59 ` [PATCH v5 5/5] block/nbd: check that received handle is valid Vladimir Sementsov-Ogievskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210714165916.102363-3-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).