From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, armbru@redhat.com, jsnow@redhat.com,
mreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com,
den@openvz.org
Subject: [PATCH v2 33/36] block: inline bdrv_replace_child()
Date: Fri, 27 Nov 2020 17:45:19 +0300 [thread overview]
Message-ID: <20201127144522.29991-34-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20201127144522.29991-1-vsementsov@virtuozzo.com>
bdrv_replace_child() has only one caller, the second argument is
unused. Inline it now. This triggers deletion of some more unused
interfaces.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block.c | 101 ++++++++++----------------------------------------------
1 file changed, 18 insertions(+), 83 deletions(-)
diff --git a/block.c b/block.c
index 6c87ad0287..3093d20db8 100644
--- a/block.c
+++ b/block.c
@@ -2336,42 +2336,6 @@ static int bdrv_list_refresh_perms(GSList *list, BlockReopenQueue *q,
return 0;
}
-static void bdrv_node_set_perm(BlockDriverState *bs)
-{
- BlockDriver *drv = bs->drv;
- BdrvChild *c;
-
- if (!drv) {
- return;
- }
-
- bdrv_drv_set_perm_commit(bs);
-
- /* Drivers that never have children can omit .bdrv_child_perm() */
- if (!drv->bdrv_child_perm) {
- assert(QLIST_EMPTY(&bs->children));
- return;
- }
-
- /* Update all children */
- QLIST_FOREACH(c, &bs->children, next) {
- bdrv_child_set_perm_commit(c);
- }
-}
-
-static void bdrv_list_set_perm(GSList *list)
-{
- for ( ; list; list = list->next) {
- bdrv_node_set_perm((BlockDriverState *)list->data);
- }
-}
-
-static void bdrv_set_perm(BlockDriverState *bs)
-{
- g_autoptr(GSList) list = bdrv_topological_dfs(NULL, NULL, bs);
- return bdrv_list_set_perm(list);
-}
-
void bdrv_get_cumulative_perm(BlockDriverState *bs, uint64_t *perm,
uint64_t *shared_perm)
{
@@ -2711,52 +2675,6 @@ static void bdrv_replace_child_noperm(BdrvChild *child,
}
}
-/*
- * Updates @child to change its reference to point to @new_bs, including
- * checking and applying the necessary permission updates both to the old node
- * and to @new_bs.
- *
- * NULL is passed as @new_bs for removing the reference before freeing @child.
- *
- * If @new_bs is not NULL, bdrv_check_perm() must be called beforehand, as this
- * function uses bdrv_set_perm() to update the permissions according to the new
- * reference that @new_bs gets.
- *
- * Callers must ensure that child->frozen is false.
- */
-static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs)
-{
- BlockDriverState *old_bs = child->bs;
-
- /* Asserts that child->frozen == false */
- bdrv_replace_child_noperm(child, new_bs);
-
- /*
- * Start with the new node's permissions. If @new_bs is a (direct
- * or indirect) child of @old_bs, we must complete the permission
- * update on @new_bs before we loosen the restrictions on @old_bs.
- * Otherwise, bdrv_check_perm() on @old_bs would re-initiate
- * updating the permissions of @new_bs, and thus not purely loosen
- * restrictions.
- */
- if (new_bs) {
- bdrv_set_perm(new_bs);
- }
-
- if (old_bs) {
- /*
- * Update permissions for old node. We're just taking a parent away, so
- * we're loosening restrictions. Errors of permission update are not
- * fatal in this case, ignore them.
- */
- bdrv_refresh_perms(old_bs, NULL);
-
- /* When the parent requiring a non-default AioContext is removed, the
- * node moves back to the main AioContext */
- bdrv_try_set_aio_context(old_bs, qemu_get_aio_context(), NULL);
- }
-}
-
/*
* This function steals the reference to child_bs from the caller.
* That reference is later dropped by bdrv_root_unref_child().
@@ -2979,8 +2897,25 @@ static int bdrv_attach_child_noperm(BlockDriverState *parent_bs,
static void bdrv_detach_child(BdrvChild *child)
{
- bdrv_replace_child(child, NULL);
+ BlockDriverState *old_bs = child->bs;
+
+ bdrv_replace_child_noperm(child, NULL);
bdrv_remove_empty_child(child);
+
+ if (old_bs) {
+ /*
+ * Update permissions for old node. We're just taking a parent away, so
+ * we're loosening restrictions. Errors of permission update are not
+ * fatal in this case, ignore them.
+ */
+ bdrv_refresh_perms(old_bs, NULL);
+
+ /*
+ * When the parent requiring a non-default AioContext is removed, the
+ * node moves back to the main AioContext
+ */
+ bdrv_try_set_aio_context(old_bs, qemu_get_aio_context(), NULL);
+ }
}
/* Callers must ensure that child->frozen is false. */
--
2.21.3
next prev parent reply other threads:[~2020-11-27 15:23 UTC|newest]
Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-27 14:44 [PATCH v2 00/36] block: update graph permissions update Vladimir Sementsov-Ogievskiy
2020-11-27 14:44 ` [PATCH v2 01/36] tests/test-bdrv-graph-mod: add test_parallel_exclusive_write Vladimir Sementsov-Ogievskiy
2020-11-27 14:44 ` [PATCH v2 02/36] tests/test-bdrv-graph-mod: add test_parallel_perm_update Vladimir Sementsov-Ogievskiy
2021-01-18 14:05 ` Kevin Wolf
2021-01-18 17:13 ` Vladimir Sementsov-Ogievskiy
2020-11-27 14:44 ` [PATCH v2 03/36] block: bdrv_append(): don't consume reference Vladimir Sementsov-Ogievskiy
2021-01-18 14:18 ` Kevin Wolf
2021-01-18 17:21 ` Vladimir Sementsov-Ogievskiy
2021-01-18 17:59 ` Kevin Wolf
2020-11-27 14:44 ` [PATCH v2 04/36] block: bdrv_append(): return status Vladimir Sementsov-Ogievskiy
2020-12-14 15:49 ` Alberto Garcia
2021-01-18 14:32 ` Kevin Wolf
2020-11-27 14:44 ` [PATCH v2 05/36] block: add bdrv_parent_try_set_aio_context Vladimir Sementsov-Ogievskiy
2021-01-18 15:08 ` Kevin Wolf
2021-01-18 17:26 ` Vladimir Sementsov-Ogievskiy
2020-11-27 14:44 ` [PATCH v2 06/36] block: BdrvChildClass: add .get_parent_aio_context handler Vladimir Sementsov-Ogievskiy
2021-01-18 15:13 ` Kevin Wolf
2021-01-18 17:36 ` Vladimir Sementsov-Ogievskiy
2021-01-19 16:38 ` Kevin Wolf
2021-01-22 11:04 ` Vladimir Sementsov-Ogievskiy
2021-01-22 11:18 ` Kevin Wolf
2021-01-22 11:26 ` Vladimir Sementsov-Ogievskiy
2020-11-27 14:44 ` [PATCH v2 07/36] block: drop ctx argument from bdrv_root_attach_child Vladimir Sementsov-Ogievskiy
2020-11-27 14:44 ` [PATCH v2 08/36] block: make bdrv_reopen_{prepare, commit, abort} private Vladimir Sementsov-Ogievskiy via
2020-12-15 17:28 ` Alberto Garcia
2021-01-18 15:24 ` [PATCH v2 08/36] block: make bdrv_reopen_{prepare,commit,abort} private Kevin Wolf
2020-11-27 14:44 ` [PATCH v2 09/36] block: return value from bdrv_replace_node() Vladimir Sementsov-Ogievskiy
2020-12-15 17:30 ` Alberto Garcia
2021-01-18 15:40 ` Kevin Wolf
2020-11-27 14:44 ` [PATCH v2 10/36] util: add transactions.c Vladimir Sementsov-Ogievskiy
2021-01-18 16:50 ` Kevin Wolf
2021-01-18 17:41 ` Vladimir Sementsov-Ogievskiy
2020-11-27 14:44 ` [PATCH v2 11/36] block: bdrv_refresh_perms: check parents compliance Vladimir Sementsov-Ogievskiy
2021-01-19 17:42 ` Kevin Wolf
2021-01-19 18:10 ` Vladimir Sementsov-Ogievskiy
2020-11-27 14:44 ` [PATCH v2 12/36] block: refactor bdrv_child* permission functions Vladimir Sementsov-Ogievskiy
2021-01-19 18:09 ` Kevin Wolf
2021-01-19 18:30 ` Vladimir Sementsov-Ogievskiy
2021-01-20 9:09 ` Kevin Wolf
2021-01-20 9:56 ` Vladimir Sementsov-Ogievskiy
2021-01-20 10:06 ` Kevin Wolf
2020-11-27 14:44 ` [PATCH v2 13/36] block: rewrite bdrv_child_try_set_perm() using bdrv_refresh_perms() Vladimir Sementsov-Ogievskiy
2020-11-27 14:45 ` [PATCH v2 14/36] block: inline bdrv_child_*() permission functions calls Vladimir Sementsov-Ogievskiy
2020-12-16 17:16 ` Alberto Garcia
2020-11-27 14:45 ` [PATCH v2 15/36] block: use topological sort for permission update Vladimir Sementsov-Ogievskiy
2021-01-27 18:38 ` Kevin Wolf
2021-01-28 9:34 ` Vladimir Sementsov-Ogievskiy
2021-01-28 17:13 ` Kevin Wolf
2021-01-28 18:04 ` Vladimir Sementsov-Ogievskiy
2021-02-03 18:38 ` Kevin Wolf
2021-02-04 7:16 ` Vladimir Sementsov-Ogievskiy
2021-03-10 11:08 ` Vladimir Sementsov-Ogievskiy
2021-03-10 11:55 ` Kevin Wolf
2020-11-27 14:45 ` [PATCH v2 16/36] block: add bdrv_drv_set_perm transaction action Vladimir Sementsov-Ogievskiy
2020-11-27 14:45 ` [PATCH v2 17/36] block: add bdrv_list_* permission update functions Vladimir Sementsov-Ogievskiy
2020-11-27 14:45 ` [PATCH v2 18/36] block: add bdrv_replace_child_safe() transaction action Vladimir Sementsov-Ogievskiy
2020-11-27 14:45 ` [PATCH v2 19/36] block: fix bdrv_replace_node_common Vladimir Sementsov-Ogievskiy
2021-02-03 18:23 ` Kevin Wolf
2021-02-04 7:24 ` Vladimir Sementsov-Ogievskiy
2020-11-27 14:45 ` [PATCH v2 20/36] block: add bdrv_attach_child_common() transaction action Vladimir Sementsov-Ogievskiy
2021-02-03 21:01 ` Kevin Wolf
2021-02-04 7:34 ` Vladimir Sementsov-Ogievskiy
2021-02-04 7:50 ` Kevin Wolf
2020-11-27 14:45 ` [PATCH v2 21/36] block: add bdrv_attach_child_noperm() " Vladimir Sementsov-Ogievskiy
2020-11-27 14:45 ` [PATCH v2 22/36] block: split out bdrv_replace_node_noperm() Vladimir Sementsov-Ogievskiy
2021-02-03 21:16 ` Kevin Wolf
2020-11-27 14:45 ` [PATCH v2 23/36] block: adapt bdrv_append() for inserting filters Vladimir Sementsov-Ogievskiy
2021-02-03 21:33 ` Kevin Wolf
2021-02-04 8:30 ` Vladimir Sementsov-Ogievskiy
2021-02-04 9:05 ` Kevin Wolf
2021-02-04 11:54 ` Vladimir Sementsov-Ogievskiy
2020-11-27 14:45 ` [PATCH v2 24/36] block: add bdrv_remove_backing transaction action Vladimir Sementsov-Ogievskiy
2020-11-27 14:45 ` [PATCH v2 25/36] block: introduce bdrv_drop_filter() Vladimir Sementsov-Ogievskiy
2021-02-04 11:31 ` Kevin Wolf
2021-02-04 12:27 ` Vladimir Sementsov-Ogievskiy
2020-11-27 14:45 ` [PATCH v2 26/36] block/backup-top: drop .active Vladimir Sementsov-Ogievskiy
2021-02-04 12:26 ` Kevin Wolf
2021-02-04 12:33 ` Vladimir Sementsov-Ogievskiy
2021-02-04 13:25 ` Kevin Wolf
2021-02-04 13:46 ` Vladimir Sementsov-Ogievskiy
2021-02-04 14:31 ` Kevin Wolf
2020-11-27 14:45 ` [PATCH v2 27/36] block: drop ignore_children for permission update functions Vladimir Sementsov-Ogievskiy
2020-11-27 14:45 ` [PATCH v2 28/36] block: add bdrv_set_backing_noperm() transaction action Vladimir Sementsov-Ogievskiy
2021-02-05 14:00 ` Kevin Wolf
2021-02-05 16:06 ` Vladimir Sementsov-Ogievskiy
2021-02-05 16:30 ` Kevin Wolf
2021-03-11 18:29 ` Vladimir Sementsov-Ogievskiy
2021-02-05 16:26 ` Kevin Wolf
2021-02-08 9:34 ` Vladimir Sementsov-Ogievskiy
2020-11-27 14:45 ` [PATCH v2 29/36] blockdev: qmp_x_blockdev_reopen: acquire all contexts Vladimir Sementsov-Ogievskiy
2021-02-05 16:01 ` Kevin Wolf
2021-02-05 16:16 ` Vladimir Sementsov-Ogievskiy
2021-02-05 16:36 ` Kevin Wolf
2020-11-27 14:45 ` [PATCH v2 30/36] block: bdrv_reopen_multiple: refresh permissions on updated graph Vladimir Sementsov-Ogievskiy
2021-02-05 17:57 ` Kevin Wolf
2021-02-08 11:21 ` Vladimir Sementsov-Ogievskiy
2021-02-10 14:13 ` Kevin Wolf
2021-02-10 14:38 ` Kevin Wolf
2020-11-27 14:45 ` [PATCH v2 31/36] block: drop unused permission update functions Vladimir Sementsov-Ogievskiy
2020-11-27 14:45 ` [PATCH v2 32/36] block: inline bdrv_check_perm_common() Vladimir Sementsov-Ogievskiy
2020-11-27 14:45 ` Vladimir Sementsov-Ogievskiy [this message]
2020-11-27 14:45 ` [PATCH v2 34/36] block: refactor bdrv_child_set_perm_safe() transaction action Vladimir Sementsov-Ogievskiy
2021-02-10 14:51 ` Kevin Wolf
2020-11-27 14:45 ` [PATCH v2 35/36] block: rename bdrv_replace_child_safe() to bdrv_replace_child() Vladimir Sementsov-Ogievskiy
2020-11-27 14:45 ` [PATCH v2 36/36] block: refactor bdrv_node_check_perm() Vladimir Sementsov-Ogievskiy
2021-02-10 15:07 ` Kevin Wolf
2021-02-11 9:50 ` Vladimir Sementsov-Ogievskiy
2021-01-09 10:12 ` [PATCH v2 00/36] block: update graph permissions update Vladimir Sementsov-Ogievskiy
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=20201127144522.29991-34-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=armbru@redhat.com \
--cc=den@openvz.org \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).