[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/15] block: Inline bdrv_drain_invoke()
From: |
Kevin Wolf |
Subject: |
[PATCH v2 05/15] block: Inline bdrv_drain_invoke() |
Date: |
Fri, 18 Nov 2022 18:41:00 +0100 |
bdrv_drain_invoke() has now two entirely separate cases that share no
code any more and are selected depending on a bool parameter. Each case
has only one caller. Just inline the function.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
---
block/io.c | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/block/io.c b/block/io.c
index f4ca62b034..a25103be6f 100644
--- a/block/io.c
+++ b/block/io.c
@@ -242,21 +242,6 @@ typedef struct {
bool ignore_bds_parents;
} BdrvCoDrainData;
-/* Recursively call BlockDriver.bdrv_drain_begin/end callbacks */
-static void bdrv_drain_invoke(BlockDriverState *bs, bool begin)
-{
- if (!bs->drv || (begin && !bs->drv->bdrv_drain_begin) ||
- (!begin && !bs->drv->bdrv_drain_end)) {
- return;
- }
-
- if (begin) {
- bs->drv->bdrv_drain_begin(bs);
- } else {
- bs->drv->bdrv_drain_end(bs);
- }
-}
-
/* Returns true if BDRV_POLL_WHILE() should go into a blocking aio_poll() */
bool bdrv_drain_poll(BlockDriverState *bs, bool recursive,
BdrvChild *ignore_parent, bool ignore_bds_parents)
@@ -390,7 +375,9 @@ void bdrv_do_drained_begin_quiesce(BlockDriverState *bs,
}
bdrv_parent_drained_begin(bs, parent, ignore_bds_parents);
- bdrv_drain_invoke(bs, true);
+ if (bs->drv && bs->drv->bdrv_drain_begin) {
+ bs->drv->bdrv_drain_begin(bs);
+ }
}
static void bdrv_do_drained_begin(BlockDriverState *bs, bool recursive,
@@ -461,7 +448,9 @@ static void bdrv_do_drained_end(BlockDriverState *bs, bool
recursive,
assert(bs->quiesce_counter > 0);
/* Re-enable things in child-to-parent order */
- bdrv_drain_invoke(bs, false);
+ if (bs->drv && bs->drv->bdrv_drain_end) {
+ bs->drv->bdrv_drain_end(bs);
+ }
bdrv_parent_drained_end(bs, parent, ignore_bds_parents);
old_quiesce_counter = qatomic_fetch_dec(&bs->quiesce_counter);
--
2.38.1
- [PATCH v2 00/15] block: Simplify drain, Kevin Wolf, 2022/11/18
- [PATCH v2 01/15] qed: Don't yield in bdrv_qed_co_drain_begin(), Kevin Wolf, 2022/11/18
- [PATCH v2 02/15] test-bdrv-drain: Don't yield in .bdrv_co_drained_begin/end(), Kevin Wolf, 2022/11/18
- [PATCH v2 05/15] block: Inline bdrv_drain_invoke(),
Kevin Wolf <=
- [PATCH v2 03/15] block: Revert .bdrv_drained_begin/end to non-coroutine_fn, Kevin Wolf, 2022/11/18
- [PATCH v2 04/15] block: Remove drained_end_counter, Kevin Wolf, 2022/11/18
- [PATCH v2 06/15] block: Fix locking for bdrv_reopen_queue_child(), Kevin Wolf, 2022/11/18
- [PATCH v2 07/15] block: Drain invidual nodes during reopen, Kevin Wolf, 2022/11/18
- [PATCH v2 08/15] block: Don't use subtree drains in bdrv_drop_intermediate(), Kevin Wolf, 2022/11/18
- [PATCH v2 11/15] block: Call drain callbacks only once, Kevin Wolf, 2022/11/18