From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, stefanha@redhat.com, eblake@redhat.com,
eesposit@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org
Subject: [PATCH v2 09/20] nbd: Remove nbd_co_flush() wrapper function
Date: Thu, 4 May 2023 13:57:39 +0200 [thread overview]
Message-ID: <20230504115750.54437-10-kwolf@redhat.com> (raw)
In-Reply-To: <20230504115750.54437-1-kwolf@redhat.com>
The only thing nbd_co_flush() does is call nbd_client_co_flush(). Just
use that function directly in the BlockDriver definitions and remove the
wrapper.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
block/nbd.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index bf2894ad5c..d3ee256844 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -1920,11 +1920,6 @@ fail:
return ret;
}
-static int coroutine_fn nbd_co_flush(BlockDriverState *bs)
-{
- return nbd_client_co_flush(bs);
-}
-
static void nbd_refresh_limits(BlockDriverState *bs, Error **errp)
{
BDRVNBDState *s = (BDRVNBDState *)bs->opaque;
@@ -2120,7 +2115,7 @@ static BlockDriver bdrv_nbd = {
.bdrv_co_pwritev = nbd_client_co_pwritev,
.bdrv_co_pwrite_zeroes = nbd_client_co_pwrite_zeroes,
.bdrv_close = nbd_close,
- .bdrv_co_flush_to_os = nbd_co_flush,
+ .bdrv_co_flush_to_os = nbd_client_co_flush,
.bdrv_co_pdiscard = nbd_client_co_pdiscard,
.bdrv_refresh_limits = nbd_refresh_limits,
.bdrv_co_truncate = nbd_co_truncate,
@@ -2148,7 +2143,7 @@ static BlockDriver bdrv_nbd_tcp = {
.bdrv_co_pwritev = nbd_client_co_pwritev,
.bdrv_co_pwrite_zeroes = nbd_client_co_pwrite_zeroes,
.bdrv_close = nbd_close,
- .bdrv_co_flush_to_os = nbd_co_flush,
+ .bdrv_co_flush_to_os = nbd_client_co_flush,
.bdrv_co_pdiscard = nbd_client_co_pdiscard,
.bdrv_refresh_limits = nbd_refresh_limits,
.bdrv_co_truncate = nbd_co_truncate,
@@ -2176,7 +2171,7 @@ static BlockDriver bdrv_nbd_unix = {
.bdrv_co_pwritev = nbd_client_co_pwritev,
.bdrv_co_pwrite_zeroes = nbd_client_co_pwrite_zeroes,
.bdrv_close = nbd_close,
- .bdrv_co_flush_to_os = nbd_co_flush,
+ .bdrv_co_flush_to_os = nbd_client_co_flush,
.bdrv_co_pdiscard = nbd_client_co_pdiscard,
.bdrv_refresh_limits = nbd_refresh_limits,
.bdrv_co_truncate = nbd_co_truncate,
--
2.40.1
next prev parent reply other threads:[~2023-05-04 12:01 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-04 11:57 [PATCH v2 00/20] Graph locking, part 3 (more block drivers) Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 01/20] qcow2: Don't call bdrv_getlength() in coroutine_fns Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 02/20] block: Consistently call bdrv_activate() outside coroutine Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 03/20] block: bdrv/blk_co_unref() for calls in coroutine context Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 04/20] block: Don't call no_coroutine_fns in qmp_block_resize() Kevin Wolf
2023-05-05 12:02 ` Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 05/20] test-bdrv-drain: Don't modify the graph in coroutines Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 06/20] graph-lock: Add GRAPH_UNLOCKED(_PTR) Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 07/20] graph-lock: Fix GRAPH_RDLOCK_GUARD*() to be reader lock Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 08/20] block: .bdrv_open is non-coroutine and unlocked Kevin Wolf
2023-05-04 11:57 ` Kevin Wolf [this message]
2023-05-04 11:57 ` [PATCH v2 10/20] nbd: Mark nbd_co_do_establish_connection() and callers GRAPH_RDLOCK Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 11/20] vhdx: Require GRAPH_RDLOCK for accessing a node's parent list Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 12/20] mirror: " Kevin Wolf
2023-05-04 13:17 ` Eric Blake
2023-05-04 15:17 ` Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 13/20] block: Mark bdrv_co_get_allocated_file_size() and callers GRAPH_RDLOCK Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 14/20] block: Mark bdrv_co_get_info() " Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 15/20] block: Mark bdrv_co_debug_event() GRAPH_RDLOCK Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 16/20] block: Mark BlockDriver callbacks for amend job GRAPH_RDLOCK Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 17/20] block: Mark bdrv_query_bds_stats() and callers GRAPH_RDLOCK Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 18/20] block: Mark bdrv_query_block_graph_info() " Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 19/20] block: Mark bdrv_recurse_can_replace() " Kevin Wolf
2023-05-04 11:57 ` [PATCH v2 20/20] block: Mark bdrv_refresh_limits() " Kevin Wolf
2023-05-09 17:07 ` [PATCH v2 00/20] Graph locking, part 3 (more block drivers) Kevin Wolf
2023-05-09 17:48 ` Stefan Hajnoczi
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=20230504115750.54437-10-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=eblake@redhat.com \
--cc=eesposit@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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).