From 61ad631cee21f878540681274fe0f53e7ee9f59e Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Fri, 19 Jul 2019 11:26:16 +0200 Subject: [PATCH] block: Loop unsafely in bdrv*drained_end() The graph must not change in these loops (or a QLIST_FOREACH_SAFE would not even be enough). We now ensure this by only polling once in the root bdrv_drained_end() call, so we can drop the _SAFE suffix. Doing so makes it clear that the graph must not change. Signed-off-by: Max Reitz Signed-off-by: Kevin Wolf --- block/io.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/block/io.c b/block/io.c index 8f23cab82e..b89e155d21 100644 --- a/block/io.c +++ b/block/io.c @@ -76,9 +76,9 @@ static void bdrv_parent_drained_end(BlockDriverState *bs, BdrvChild *ignore, bool ignore_bds_parents, int *drained_end_counter) { - BdrvChild *c, *next; + BdrvChild *c; - QLIST_FOREACH_SAFE(c, &bs->parents, next_parent, next) { + QLIST_FOREACH(c, &bs->parents, next_parent) { if (c == ignore || (ignore_bds_parents && c->role->parent_is_bds)) { continue; } @@ -456,7 +456,7 @@ static void bdrv_do_drained_end(BlockDriverState *bs, bool recursive, BdrvChild *parent, bool ignore_bds_parents, int *drained_end_counter) { - BdrvChild *child, *next; + BdrvChild *child; int old_quiesce_counter; assert(drained_end_counter != NULL); @@ -481,7 +481,7 @@ static void bdrv_do_drained_end(BlockDriverState *bs, bool recursive, if (recursive) { assert(!ignore_bds_parents); bs->recursive_quiesce_counter--; - QLIST_FOREACH_SAFE(child, &bs->children, next, next) { + QLIST_FOREACH(child, &bs->children, next) { bdrv_do_drained_end(child->bs, true, child, ignore_bds_parents, drained_end_counter); } -- 2.11.0