From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Date: Fri, 6 Nov 2020 12:42:35 +0000 (+0300)
Subject: block: add forgotten bdrv_abort_perm_update() to bdrv_co_invalidate_cache()
X-Git-Tag: v5.2.0-rc1~6^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c5f7b3a1002ebe552782de4f3664a486d444323;p=thirdparty%2Fqemu.git

block: add forgotten bdrv_abort_perm_update() to bdrv_co_invalidate_cache()

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20201106124241.16950-2-vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---

diff --git a/block.c b/block.c
index 2fd932154e1..1e68bd2f5fd 100644
--- a/block.c
+++ b/block.c
@@ -5787,6 +5787,7 @@ int coroutine_fn bdrv_co_invalidate_cache(BlockDriverState *bs, Error **errp)
         bdrv_get_cumulative_perm(bs, &perm, &shared_perm);
         ret = bdrv_check_perm(bs, NULL, perm, shared_perm, NULL, NULL, errp);
         if (ret < 0) {
+            bdrv_abort_perm_update(bs);
             bs->open_flags |= BDRV_O_INACTIVE;
             return ret;
         }