@@ -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;
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(-)