[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 10/11] block: rename bdrv_child_try_change_aio_context in bdrv
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH v2 10/11] block: rename bdrv_child_try_change_aio_context in bdrv_try_change_aio_context |
Date: |
Mon, 25 Jul 2022 08:21:19 -0400 |
No functional changes intended.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
block.c | 19 ++++++++-----------
block/block-backend.c | 3 +--
include/block/block-global-state.h | 12 +++++-------
3 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/block.c b/block.c
index c066b41c8c..b82eb0ba6d 100644
--- a/block.c
+++ b/block.c
@@ -7462,11 +7462,9 @@ static bool bdrv_change_aio_context(BlockDriverState
*bs, AioContext *ctx,
* For the same reason, it temporarily holds also the new AioContext, since
* bdrv_drained_end calls BDRV_POLL_WHILE that assumes the lock is taken too.
*/
-int bdrv_child_try_change_aio_context_tran(BlockDriverState *bs,
- AioContext *ctx,
- BdrvChild *ignore_child,
- Transaction *tran,
- Error **errp)
+int bdrv_try_change_aio_context_tran(BlockDriverState *bs, AioContext *ctx,
+ BdrvChild *ignore_child, Transaction
*tran,
+ Error **errp)
{
GHashTable *visited;
int ret;
@@ -7483,11 +7481,11 @@ int
bdrv_child_try_change_aio_context_tran(BlockDriverState *bs,
}
/*
- * See bdrv_child_try_change_aio_context_tran for invariants on
+ * See bdrv_try_change_aio_context_tran for invariants on
* AioContext locks.
*/
-int bdrv_child_try_change_aio_context(BlockDriverState *bs, AioContext *ctx,
- BdrvChild *ignore_child, Error **errp)
+int bdrv_try_change_aio_context(BlockDriverState *bs, AioContext *ctx,
+ BdrvChild *ignore_child, Error **errp)
{
Transaction *tran;
int ret;
@@ -7496,8 +7494,7 @@ int bdrv_child_try_change_aio_context(BlockDriverState
*bs, AioContext *ctx,
/* Recursion phase: go through all nodes of the graph */
tran = tran_new();
- ret = bdrv_child_try_change_aio_context_tran(bs, ctx, ignore_child, tran,
- errp);
+ ret = bdrv_try_change_aio_context_tran(bs, ctx, ignore_child, tran, errp);
/* Linear phase: go through all callbacks collected in the transaction */
@@ -7542,7 +7539,7 @@ int bdrv_try_set_aio_context(BlockDriverState *bs,
AioContext *ctx,
Error **errp)
{
GLOBAL_STATE_CODE();
- return bdrv_child_try_change_aio_context(bs, ctx, NULL, errp);
+ return bdrv_try_change_aio_context(bs, ctx, NULL, errp);
}
void bdrv_add_aio_context_notifier(BlockDriverState *bs,
diff --git a/block/block-backend.c b/block/block-backend.c
index a27b8b7a89..f785c1e7e2 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -2182,8 +2182,7 @@ static int blk_do_set_aio_context(BlockBackend *blk,
AioContext *new_context,
* update_root_node MUST be false for
blk_root_set_aio_ctx_commit(),
* as we are already in the commit function of a transaction.
*/
- ret = bdrv_child_try_change_aio_context(bs, new_context, blk->root,
- errp);
+ ret = bdrv_try_change_aio_context(bs, new_context, blk->root,
errp);
if (ret < 0) {
bdrv_unref(bs);
return ret;
diff --git a/include/block/block-global-state.h
b/include/block/block-global-state.h
index 54fd008442..11f80768c3 100644
--- a/include/block/block-global-state.h
+++ b/include/block/block-global-state.h
@@ -223,13 +223,11 @@ AioContext *bdrv_child_get_parent_aio_context(BdrvChild
*c);
bool bdrv_child_change_aio_context(BdrvChild *c, AioContext *ctx,
GHashTable *visited, Transaction *tran,
Error **errp);
-int bdrv_child_try_change_aio_context(BlockDriverState *bs, AioContext *ctx,
- BdrvChild *ignore_child, Error **errp);
-int bdrv_child_try_change_aio_context_tran(BlockDriverState *bs,
- AioContext *ctx,
- BdrvChild *ignore_child,
- Transaction *tran,
- Error **errp);
+int bdrv_try_change_aio_context(BlockDriverState *bs, AioContext *ctx,
+ BdrvChild *ignore_child, Error **errp);
+int bdrv_try_change_aio_context_tran(BlockDriverState *bs, AioContext *ctx,
+ BdrvChild *ignore_child, Transaction
*tran,
+ Error **errp);
int bdrv_probe_blocksizes(BlockDriverState *bs, BlockSizes *bsz);
int bdrv_probe_geometry(BlockDriverState *bs, HDGeometry *geo);
--
2.31.1
- [PATCH v2 00/11] Refactor bdrv_try_set_aio_context using transactions, Emanuele Giuseppe Esposito, 2022/07/25
- [PATCH v2 04/11] bdrv_child_try_change_aio_context: add transaction parameter, Emanuele Giuseppe Esposito, 2022/07/25
- [PATCH v2 10/11] block: rename bdrv_child_try_change_aio_context in bdrv_try_change_aio_context,
Emanuele Giuseppe Esposito <=
- [PATCH v2 05/11] blockjob: implement .change_aio_ctx in child_job, Emanuele Giuseppe Esposito, 2022/07/25
- [PATCH v2 01/11] block.c: assert bs->aio_context is written under BQL and drains, Emanuele Giuseppe Esposito, 2022/07/25
- [PATCH v2 08/11] block: use the new _change_ API instead of _can_set_ and _set_, Emanuele Giuseppe Esposito, 2022/07/25
- [PATCH v2 07/11] block-backend: implement .change_aio_ctx in child_root, Emanuele Giuseppe Esposito, 2022/07/25
- [PATCH v2 06/11] block: implement .change_aio_ctx in child_of_bds, Emanuele Giuseppe Esposito, 2022/07/25
- [PATCH v2 09/11] block: remove all unused ->can_set_aio_ctx and ->set_aio_ctx callbacks, Emanuele Giuseppe Esposito, 2022/07/25
- [PATCH v2 02/11] block: use transactions as a replacement of ->{can_}set_aio_context(), Emanuele Giuseppe Esposito, 2022/07/25
- [PATCH v2 03/11] bdrv_change_aio_context: use hash table instead of list of visited nodes, Emanuele Giuseppe Esposito, 2022/07/25
- [PATCH v2 11/11] block: remove bdrv_try_set_aio_context and replace it with bdrv_try_change_aio_context, Emanuele Giuseppe Esposito, 2022/07/25
- Re: [PATCH v2 00/11] Refactor bdrv_try_set_aio_context using transactions, Vladimir Sementsov-Ogievskiy, 2022/07/26