[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/14] Revert "block: Restructure remove_file_or_backing_child()"
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 11/14] Revert "block: Restructure remove_file_or_backing_child()" |
Date: |
Fri, 3 Dec 2021 21:25:50 +0100 |
That's a preparation to previously reverted
"block: Let replace_child_noperm free children". Drop it too, we don't
need it for a new approach.
This reverts commit 562bda8bb41879eeda0bd484dd3d55134579b28e.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/block.c b/block.c
index 3eec53796b..2ba95f71b9 100644
--- a/block.c
+++ b/block.c
@@ -4908,33 +4908,30 @@ static void
bdrv_remove_file_or_backing_child(BlockDriverState *bs,
BdrvChild *child,
Transaction *tran)
{
- BdrvChild **childp;
BdrvRemoveFilterOrCowChild *s;
+ assert(child == bs->backing || child == bs->file);
+
if (!child) {
return;
}
- if (child == bs->backing) {
- childp = &bs->backing;
- } else if (child == bs->file) {
- childp = &bs->file;
- } else {
- g_assert_not_reached();
- }
-
if (child->bs) {
- bdrv_replace_child_tran(*childp, NULL, tran);
+ bdrv_replace_child_tran(child, NULL, tran);
}
s = g_new(BdrvRemoveFilterOrCowChild, 1);
*s = (BdrvRemoveFilterOrCowChild) {
.child = child,
- .is_backing = (childp == &bs->backing),
+ .is_backing = (child == bs->backing),
};
tran_add(tran, &bdrv_remove_filter_or_cow_child_drv, s);
- *childp = NULL;
+ if (s->is_backing) {
+ bs->backing = NULL;
+ } else {
+ bs->file = NULL;
+ }
}
/*
--
2.31.1
- [PATCH 00/14] block: cleanup backing and file handling, Vladimir Sementsov-Ogievskiy, 2021/12/03
- [PATCH 01/14] block: BlockDriver: add .filtered_child_is_backing field, Vladimir Sementsov-Ogievskiy, 2021/12/03
- [PATCH 09/14] Revert "block: Let replace_child_noperm free children", Vladimir Sementsov-Ogievskiy, 2021/12/03
- [PATCH 10/14] Revert "block: Let replace_child_tran keep indirect pointer", Vladimir Sementsov-Ogievskiy, 2021/12/03
- [PATCH 11/14] Revert "block: Restructure remove_file_or_backing_child()",
Vladimir Sementsov-Ogievskiy <=
- [PATCH 03/14] block/blklogwrites: don't care to remove bs->file child on failure, Vladimir Sementsov-Ogievskiy, 2021/12/03
- [PATCH 04/14] test-bdrv-graph-mod: update test_parallel_perm_update test case, Vladimir Sementsov-Ogievskiy, 2021/12/03
- [PATCH 05/14] tests-bdrv-drain: bdrv_replace_test driver: declare supports_backing, Vladimir Sementsov-Ogievskiy, 2021/12/03
- [PATCH 02/14] block: introduce bdrv_open_file_child() helper, Vladimir Sementsov-Ogievskiy, 2021/12/03
- [PATCH 12/14] Revert "block: Pass BdrvChild ** to replace_child_noperm", Vladimir Sementsov-Ogievskiy, 2021/12/03
- [PATCH 13/14] block: Manipulate bs->file / bs->backing pointers in .attach/.detach, Vladimir Sementsov-Ogievskiy, 2021/12/03
- [PATCH 06/14] test-bdrv-graph-mod: fix filters to be filters, Vladimir Sementsov-Ogievskiy, 2021/12/03
- [PATCH 07/14] block: document connection between child roles and bs->backing/bs->file, Vladimir Sementsov-Ogievskiy, 2021/12/03
- [PATCH 14/14] block/snapshot: drop indirection around bdrv_snapshot_fallback_ptr, Vladimir Sementsov-Ogievskiy, 2021/12/03
- [PATCH 08/14] block/snapshot: stress that we fallback to primary child, Vladimir Sementsov-Ogievskiy, 2021/12/03