From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, armbru@redhat.com, fam@euphon.net,
stefanha@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com,
mreitz@redhat.com, kwolf@redhat.com
Subject: [PATCH v4 26/36] block: make bdrv_unset_inherits_from to be a transaction action
Date: Wed, 28 Apr 2021 18:17:54 +0300 [thread overview]
Message-ID: <20210428151804.439460-27-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210428151804.439460-1-vsementsov@virtuozzo.com>
To be used in the further commit.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
---
block.c | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 42 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index 46af5852ab..1dc14908ac 100644
--- a/block.c
+++ b/block.c
@@ -3205,11 +3205,49 @@ void bdrv_root_unref_child(BdrvChild *child)
bdrv_unref(child_bs);
}
+typedef struct BdrvSetInheritsFrom {
+ BlockDriverState *bs;
+ BlockDriverState *old_inherits_from;
+} BdrvSetInheritsFrom;
+
+static void bdrv_set_inherits_from_abort(void *opaque)
+{
+ BdrvSetInheritsFrom *s = opaque;
+
+ s->bs->inherits_from = s->old_inherits_from;
+}
+
+static TransactionActionDrv bdrv_set_inherits_from_drv = {
+ .abort = bdrv_set_inherits_from_abort,
+ .clean = g_free,
+};
+
+/* @tran is allowed to be NULL. In this case no rollback is possible */
+static void bdrv_set_inherits_from(BlockDriverState *bs,
+ BlockDriverState *new_inherits_from,
+ Transaction *tran)
+{
+ if (tran) {
+ BdrvSetInheritsFrom *s = g_new(BdrvSetInheritsFrom, 1);
+
+ *s = (BdrvSetInheritsFrom) {
+ .bs = bs,
+ .old_inherits_from = bs->inherits_from,
+ };
+
+ tran_add(tran, &bdrv_set_inherits_from_drv, s);
+ }
+
+ bs->inherits_from = new_inherits_from;
+}
+
/**
* Clear all inherits_from pointers from children and grandchildren of
* @root that point to @root, where necessary.
+ * @tran is allowed to be NULL. In this case no rollback is possible
*/
-static void bdrv_unset_inherits_from(BlockDriverState *root, BdrvChild *child)
+static void bdrv_unset_inherits_from(BlockDriverState *root, BdrvChild *child,
+ Transaction *tran)
{
BdrvChild *c;
@@ -3224,12 +3262,12 @@ static void bdrv_unset_inherits_from(BlockDriverState *root, BdrvChild *child)
}
}
if (c == NULL) {
- child->bs->inherits_from = NULL;
+ bdrv_set_inherits_from(child->bs, NULL, tran);
}
}
QLIST_FOREACH(c, &child->bs->children, next) {
- bdrv_unset_inherits_from(root, c);
+ bdrv_unset_inherits_from(root, c, tran);
}
}
@@ -3240,7 +3278,7 @@ void bdrv_unref_child(BlockDriverState *parent, BdrvChild *child)
return;
}
- bdrv_unset_inherits_from(parent, child);
+ bdrv_unset_inherits_from(parent, child, NULL);
bdrv_root_unref_child(child);
}
--
2.29.2
next prev parent reply other threads:[~2021-04-28 15:50 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-28 15:17 [PATCH v4 00/36] block: update graph permissions update Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 01/36] tests/test-bdrv-graph-mod: add test_parallel_exclusive_write Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 02/36] tests/test-bdrv-graph-mod: add test_parallel_perm_update Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 03/36] tests/test-bdrv-graph-mod: add test_append_greedy_filter Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 04/36] block: bdrv_append(): don't consume reference Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 05/36] block: BdrvChildClass: add .get_parent_aio_context handler Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 06/36] block: drop ctx argument from bdrv_root_attach_child Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 07/36] block: make bdrv_reopen_{prepare, commit, abort} private Vladimir Sementsov-Ogievskiy via
2021-04-28 15:17 ` [PATCH v4 08/36] util: add transactions.c Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 09/36] block: bdrv_refresh_perms: check for parents permissions conflict Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 10/36] block: refactor bdrv_child* permission functions Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 11/36] block: rewrite bdrv_child_try_set_perm() using bdrv_refresh_perms() Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 12/36] block: inline bdrv_child_*() permission functions calls Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 13/36] block: use topological sort for permission update Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 14/36] block: add bdrv_drv_set_perm transaction action Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 15/36] block: add bdrv_list_* permission update functions Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 16/36] block: add bdrv_replace_child_safe() transaction action Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 17/36] block: fix bdrv_replace_node_common Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 18/36] block: add bdrv_attach_child_common() transaction action Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 19/36] block: add bdrv_attach_child_noperm() " Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 20/36] block: split out bdrv_replace_node_noperm() Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 21/36] block: adapt bdrv_append() for inserting filters Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 22/36] block: add bdrv_remove_filter_or_cow transaction action Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 23/36] block: introduce bdrv_drop_filter() Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 24/36] block/backup-top: drop .active Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 25/36] block: drop ignore_children for permission update functions Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` Vladimir Sementsov-Ogievskiy [this message]
2021-04-28 15:17 ` [PATCH v4 27/36] block: make bdrv_refresh_limits() to be a transaction action Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 28/36] block: add bdrv_set_backing_noperm() " Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 29/36] block: bdrv_reopen_multiple(): move bdrv_flush to separate pre-prepare Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 30/36] block: bdrv_reopen_multiple: refresh permissions on updated graph Vladimir Sementsov-Ogievskiy
2021-04-28 15:17 ` [PATCH v4 31/36] block: drop unused permission update functions Vladimir Sementsov-Ogievskiy
2021-04-28 15:18 ` [PATCH v4 32/36] block: inline bdrv_check_perm_common() Vladimir Sementsov-Ogievskiy
2021-04-28 15:18 ` [PATCH v4 33/36] block: inline bdrv_replace_child() Vladimir Sementsov-Ogievskiy
2021-04-28 15:18 ` [PATCH v4 34/36] block: refactor bdrv_child_set_perm_safe() transaction action Vladimir Sementsov-Ogievskiy
2021-04-28 15:18 ` [PATCH v4 35/36] block: rename bdrv_replace_child_safe() to bdrv_replace_child() Vladimir Sementsov-Ogievskiy
2021-04-28 15:18 ` [PATCH v4 36/36] block: refactor bdrv_node_check_perm() Vladimir Sementsov-Ogievskiy
2021-04-28 16:15 ` [PATCH v4 00/36] block: update graph permissions update no-reply
2021-04-28 17:03 ` Kevin Wolf
2021-04-28 19:50 ` Vladimir Sementsov-Ogievskiy
2021-05-05 7:24 ` 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=20210428151804.439460-27-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=armbru@redhat.com \
--cc=fam@euphon.net \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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).