[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/12] block.c: bdrv_replace_child_noperm: first remove the child
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH 03/12] block.c: bdrv_replace_child_noperm: first remove the child, and then call ->detach() |
Date: |
Tue, 18 Jan 2022 11:27:29 -0500 |
Doing the opposite can make ->detach() (more precisely
bdrv_unapply_subtree_drain() in bdrv_child_cb_detach) undo the subtree_drain
just performed to protect the removal of the child from the graph,
thus making the fully-enabled assert_bdrv_graph_writable fail.
Note that assert_bdrv_graph_writable is not yet fully enabled.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
block.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index 08fde585f4..29de2b62b5 100644
--- a/block.c
+++ b/block.c
@@ -2861,14 +2861,16 @@ static void bdrv_replace_child_noperm(BdrvChild
**childp,
}
if (old_bs) {
- /* Detach first so that the recursive drain sections coming from @child
+ assert_bdrv_graph_writable(old_bs);
+ QLIST_REMOVE(child, next_parent);
+ /*
+ * Detach first so that the recursive drain sections coming from @child
* are already gone and we only end the drain sections that came from
- * elsewhere. */
+ * elsewhere.
+ */
if (child->klass->detach) {
child->klass->detach(child);
}
- assert_bdrv_graph_writable(old_bs);
- QLIST_REMOVE(child, next_parent);
}
child->bs = new_bs;
--
2.31.1
- Re: [PATCH 01/12] introduce BDRV_POLL_WHILE_UNLOCKED, (continued)
- [PATCH 09/12] jobs: ensure sleep in job_sleep_ns is fully performed, Emanuele Giuseppe Esposito, 2022/01/18
- [PATCH 08/12] reopen: add a transaction to drain_end nodes picked in bdrv_reopen_parse_file_or_backing, Emanuele Giuseppe Esposito, 2022/01/18
- [PATCH 10/12] block.c: add subtree_drains where needed, Emanuele Giuseppe Esposito, 2022/01/18
- [PATCH 12/12] block.c: additional assert qemu in main tread, Emanuele Giuseppe Esposito, 2022/01/18
- [PATCH 06/12] test-bdrv-drain.c: remove test_detach_by_parent_cb(), Emanuele Giuseppe Esposito, 2022/01/18
- [PATCH 03/12] block.c: bdrv_replace_child_noperm: first remove the child, and then call ->detach(),
Emanuele Giuseppe Esposito <=
- [PATCH 02/12] block/io.c: make bdrv_do_drained_begin_quiesce static and introduce bdrv_drained_begin_no_poll, Emanuele Giuseppe Esposito, 2022/01/18
- [PATCH 04/12] block.c: bdrv_replace_child_noperm: first call ->attach(), and then add child, Emanuele Giuseppe Esposito, 2022/01/18
- [PATCH 07/12] block/io.c: introduce bdrv_subtree_drained_{begin/end}_unlocked, Emanuele Giuseppe Esposito, 2022/01/18
- [PATCH 11/12] block/io.c: fully enable assert_bdrv_graph_writable, Emanuele Giuseppe Esposito, 2022/01/18
- Re: [PATCH 00/12] Removal of Aiocontext lock through drains: protect bdrv_replace_child_noperm., Paolo Bonzini, 2022/01/19
- Re: [PATCH 00/12] Removal of Aiocontext lock through drains: protect bdrv_replace_child_noperm., Stefan Hajnoczi, 2022/01/26