From 1bab38e7bd29347aca642c55a1de91ec6680efce Mon Sep 17 00:00:00 2001 From: Alberto Garcia Date: Fri, 29 Jun 2018 14:37:01 +0300 Subject: block: Simplify bdrv_reopen_abort() If a bdrv_reopen_multiple() call fails, then the explicit_options QDict has to be deleted for every entry in the reopen queue. This must happen regardless of whether that entry's bdrv_reopen_prepare() call succeeded or not. This patch simplifies the cleanup code a bit. Signed-off-by: Alberto Garcia Signed-off-by: Kevin Wolf --- block.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'block.c') diff --git a/block.c b/block.c index a8fbab3..e82cfa6 100644 --- a/block.c +++ b/block.c @@ -3050,9 +3050,10 @@ int bdrv_reopen_multiple(AioContext *ctx, BlockReopenQueue *bs_queue, Error **er cleanup: QSIMPLEQ_FOREACH_SAFE(bs_entry, bs_queue, entry, next) { - if (ret && bs_entry->prepared) { - bdrv_reopen_abort(&bs_entry->state); - } else if (ret) { + if (ret) { + if (bs_entry->prepared) { + bdrv_reopen_abort(&bs_entry->state); + } qobject_unref(bs_entry->state.explicit_options); } qobject_unref(bs_entry->state.options); @@ -3341,8 +3342,6 @@ void bdrv_reopen_abort(BDRVReopenState *reopen_state) drv->bdrv_reopen_abort(reopen_state); } - qobject_unref(reopen_state->explicit_options); - bdrv_abort_perm_update(reopen_state->bs); } -- cgit v1.1