From bbc02b90bcba371818dbffec89933072f9406945 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Tue, 28 Feb 2017 12:45:58 +0100 Subject: blockjob: Factor out block_job_remove_all_bdrv() In some cases, we want to remove op blockers on intermediate nodes before the whole block job transaction has completed (because they block restoring the final graph state during completion). Provide a function for this. The whole block job lifecycle is a bit messed up and it's hard to actually do all things in the right order, but I'll leave simplifying this for another day. Signed-off-by: Kevin Wolf Acked-by: Fam Zheng Reviewed-by: Max Reitz --- blockjob.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'blockjob.c') diff --git a/blockjob.c b/blockjob.c index 4216cdeebf..69126af97f 100644 --- a/blockjob.c +++ b/blockjob.c @@ -128,6 +128,18 @@ static void block_job_detach_aio_context(void *opaque) block_job_unref(job); } +void block_job_remove_all_bdrv(BlockJob *job) +{ + GSList *l; + for (l = job->nodes; l; l = l->next) { + BdrvChild *c = l->data; + bdrv_op_unblock_all(c->bs, job->blocker); + bdrv_root_unref_child(c); + } + g_slist_free(job->nodes); + job->nodes = NULL; +} + int block_job_add_bdrv(BlockJob *job, const char *name, BlockDriverState *bs, uint64_t perm, uint64_t shared_perm, Error **errp) { @@ -258,15 +270,9 @@ void block_job_ref(BlockJob *job) void block_job_unref(BlockJob *job) { if (--job->refcnt == 0) { - GSList *l; BlockDriverState *bs = blk_bs(job->blk); bs->job = NULL; - for (l = job->nodes; l; l = l->next) { - BdrvChild *c = l->data; - bdrv_op_unblock_all(c->bs, job->blocker); - bdrv_root_unref_child(c); - } - g_slist_free(job->nodes); + block_job_remove_all_bdrv(job); blk_remove_aio_context_notifier(job->blk, block_job_attached_aio_context, block_job_detach_aio_context, job); -- cgit v1.2.1