[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/39] block: inline bdrv_child_*() permission functions calls
From: |
Kevin Wolf |
Subject: |
[PULL 12/39] block: inline bdrv_child_*() permission functions calls |
Date: |
Fri, 30 Apr 2021 12:51:20 +0200 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Each of them has only one caller. Open-coding simplifies further
pemission-update system changes.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210428151804.439460-13-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block.c | 59 +++++++++++++++++----------------------------------------
1 file changed, 17 insertions(+), 42 deletions(-)
diff --git a/block.c b/block.c
index 4511766825..e5af4cdae9 100644
--- a/block.c
+++ b/block.c
@@ -1974,11 +1974,11 @@ static int bdrv_fill_options(QDict **options, const
char *filename,
return 0;
}
-static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q,
- uint64_t perm, uint64_t shared,
- GSList *ignore_children, Error **errp);
-static void bdrv_child_abort_perm_update(BdrvChild *c);
-static void bdrv_child_set_perm(BdrvChild *c);
+static int bdrv_check_update_perm(BlockDriverState *bs, BlockReopenQueue *q,
+ uint64_t new_used_perm,
+ uint64_t new_shared_perm,
+ GSList *ignore_children,
+ Error **errp);
typedef struct BlockReopenQueueEntry {
bool prepared;
@@ -2226,15 +2226,21 @@ static int bdrv_check_perm(BlockDriverState *bs,
BlockReopenQueue *q,
/* Check all children */
QLIST_FOREACH(c, &bs->children, next) {
uint64_t cur_perm, cur_shared;
+ GSList *cur_ignore_children;
bdrv_child_perm(bs, c->bs, c, c->role, q,
cumulative_perms, cumulative_shared_perms,
&cur_perm, &cur_shared);
- ret = bdrv_child_check_perm(c, q, cur_perm, cur_shared,
ignore_children,
- errp);
+
+ cur_ignore_children = g_slist_prepend(g_slist_copy(ignore_children),
c);
+ ret = bdrv_check_update_perm(c->bs, q, cur_perm, cur_shared,
+ cur_ignore_children, errp);
+ g_slist_free(cur_ignore_children);
if (ret < 0) {
return ret;
}
+
+ bdrv_child_set_perm_safe(c, cur_perm, cur_shared, NULL);
}
return 0;
@@ -2261,7 +2267,8 @@ static void bdrv_abort_perm_update(BlockDriverState *bs)
}
QLIST_FOREACH(c, &bs->children, next) {
- bdrv_child_abort_perm_update(c);
+ bdrv_child_set_perm_abort(c);
+ bdrv_abort_perm_update(c->bs);
}
}
@@ -2290,7 +2297,8 @@ static void bdrv_set_perm(BlockDriverState *bs)
/* Update all children */
QLIST_FOREACH(c, &bs->children, next) {
- bdrv_child_set_perm(c);
+ bdrv_child_set_perm_commit(c);
+ bdrv_set_perm(c->bs);
}
}
@@ -2398,39 +2406,6 @@ static int bdrv_check_update_perm(BlockDriverState *bs,
BlockReopenQueue *q,
ignore_children, errp);
}
-/* Needs to be followed by a call to either bdrv_child_set_perm() or
- * bdrv_child_abort_perm_update(). */
-static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q,
- uint64_t perm, uint64_t shared,
- GSList *ignore_children, Error **errp)
-{
- int ret;
-
- ignore_children = g_slist_prepend(g_slist_copy(ignore_children), c);
- ret = bdrv_check_update_perm(c->bs, q, perm, shared, ignore_children,
errp);
- g_slist_free(ignore_children);
-
- if (ret < 0) {
- return ret;
- }
-
- bdrv_child_set_perm_safe(c, perm, shared, NULL);
-
- return 0;
-}
-
-static void bdrv_child_set_perm(BdrvChild *c)
-{
- bdrv_child_set_perm_commit(c);
- bdrv_set_perm(c->bs);
-}
-
-static void bdrv_child_abort_perm_update(BdrvChild *c)
-{
- bdrv_child_set_perm_abort(c);
- bdrv_abort_perm_update(c->bs);
-}
-
static int bdrv_refresh_perms(BlockDriverState *bs, Error **errp)
{
int ret;
--
2.30.2
- [PULL 02/39] tests/test-bdrv-graph-mod: add test_parallel_perm_update, (continued)
- [PULL 02/39] tests/test-bdrv-graph-mod: add test_parallel_perm_update, Kevin Wolf, 2021/04/30
- [PULL 04/39] block: bdrv_append(): don't consume reference, Kevin Wolf, 2021/04/30
- [PULL 03/39] tests/test-bdrv-graph-mod: add test_append_greedy_filter, Kevin Wolf, 2021/04/30
- [PULL 06/39] block: drop ctx argument from bdrv_root_attach_child, Kevin Wolf, 2021/04/30
- [PULL 05/39] block: BdrvChildClass: add .get_parent_aio_context handler, Kevin Wolf, 2021/04/30
- [PULL 07/39] block: make bdrv_reopen_{prepare,commit,abort} private, Kevin Wolf, 2021/04/30
- [PULL 08/39] util: add transactions.c, Kevin Wolf, 2021/04/30
- [PULL 09/39] block: bdrv_refresh_perms: check for parents permissions conflict, Kevin Wolf, 2021/04/30
- [PULL 11/39] block: rewrite bdrv_child_try_set_perm() using bdrv_refresh_perms(), Kevin Wolf, 2021/04/30
- [PULL 10/39] block: refactor bdrv_child* permission functions, Kevin Wolf, 2021/04/30
- [PULL 12/39] block: inline bdrv_child_*() permission functions calls,
Kevin Wolf <=
- [PULL 13/39] block: use topological sort for permission update, Kevin Wolf, 2021/04/30
- [PULL 14/39] block: add bdrv_drv_set_perm transaction action, Kevin Wolf, 2021/04/30
- [PULL 15/39] block: add bdrv_list_* permission update functions, Kevin Wolf, 2021/04/30
- [PULL 17/39] block: fix bdrv_replace_node_common, Kevin Wolf, 2021/04/30
- [PULL 19/39] block: add bdrv_attach_child_noperm() transaction action, Kevin Wolf, 2021/04/30
- [PULL 18/39] block: add bdrv_attach_child_common() transaction action, Kevin Wolf, 2021/04/30
- [PULL 20/39] block: split out bdrv_replace_node_noperm(), Kevin Wolf, 2021/04/30
- [PULL 16/39] block: add bdrv_replace_child_safe() transaction action, Kevin Wolf, 2021/04/30
- [PULL 23/39] block: introduce bdrv_drop_filter(), Kevin Wolf, 2021/04/30