[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 09/10] block: rename bdrv_child_try_change_aio_context in bdrv
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH v3 09/10] block: rename bdrv_child_try_change_aio_context in bdrv_try_change_aio_context |
Date: |
Tue, 25 Oct 2022 04:49:51 -0400 |
No functional changes intended.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
---
block.c | 6 +++---
block/block-backend.c | 3 +--
include/block/block-global-state.h | 4 ++--
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/block.c b/block.c
index 3a59f7b7e0..ad8bc167ee 100644
--- a/block.c
+++ b/block.c
@@ -7340,8 +7340,8 @@ static bool bdrv_change_aio_context(BlockDriverState *bs,
AioContext *ctx,
* bdrv_drained_end calls BDRV_POLL_WHILE that assumes the lock is taken too.
* Therefore the new AioContext lock must not be taken by the caller.
*/
-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;
GHashTable *visited;
@@ -7411,7 +7411,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 a91c8d3916..705afef9b3 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -2151,8 +2151,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 03d4ade7c2..8db3132e8f 100644
--- a/include/block/block-global-state.h
+++ b/include/block/block-global-state.h
@@ -226,8 +226,8 @@ 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_try_change_aio_context(BlockDriverState *bs, AioContext *ctx,
+ BdrvChild *ignore_child, Error **errp);
int bdrv_probe_blocksizes(BlockDriverState *bs, BlockSizes *bsz);
int bdrv_probe_geometry(BlockDriverState *bs, HDGeometry *geo);
--
2.31.1
- [PATCH v3 00/10] Refactor bdrv_try_set_aio_context using transactions, Emanuele Giuseppe Esposito, 2022/10/25
- [PATCH v3 08/10] block: remove all unused ->can_set_aio_ctx and ->set_aio_ctx callbacks, Emanuele Giuseppe Esposito, 2022/10/25
- [PATCH v3 07/10] block: use the new _change_ API instead of _can_set_ and _set_, Emanuele Giuseppe Esposito, 2022/10/25
- [PATCH v3 05/10] block: implement .change_aio_ctx in child_of_bds, Emanuele Giuseppe Esposito, 2022/10/25
- [PATCH v3 04/10] blockjob: implement .change_aio_ctx in child_job, Emanuele Giuseppe Esposito, 2022/10/25
- [PATCH v3 03/10] bdrv_change_aio_context: use hash table instead of list of visited nodes, Emanuele Giuseppe Esposito, 2022/10/25
- [PATCH v3 02/10] block: use transactions as a replacement of ->{can_}set_aio_context(), Emanuele Giuseppe Esposito, 2022/10/25
- [PATCH v3 01/10] block.c: assert bs->aio_context is written under BQL and drains, Emanuele Giuseppe Esposito, 2022/10/25
- [PATCH v3 09/10] block: rename bdrv_child_try_change_aio_context in bdrv_try_change_aio_context,
Emanuele Giuseppe Esposito <=
- [PATCH v3 06/10] block-backend: implement .change_aio_ctx in child_root, Emanuele Giuseppe Esposito, 2022/10/25
- [PATCH v3 10/10] block: remove bdrv_try_set_aio_context and replace it with bdrv_try_change_aio_context, Emanuele Giuseppe Esposito, 2022/10/25
- Re: [PATCH v3 00/10] Refactor bdrv_try_set_aio_context using transactions, Kevin Wolf, 2022/10/25