parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD

Replace the way we use mutex in parallels_co_check() for simplier
and less error prone code.

Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Message-Id: <20230424093147.197643-12-alexander.ivanov@virtuozzo.com>
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
master
Alexander Ivanov 2023-04-24 11:31:46 +02:00 committed by Hanna Czenczek
parent 7e259e2540
commit c0fc051dd4
1 changed files with 16 additions and 21 deletions

View File

@ -562,30 +562,25 @@ parallels_co_check(BlockDriverState *bs, BdrvCheckResult *res,
BDRVParallelsState *s = bs->opaque;
int ret;
qemu_co_mutex_lock(&s->lock);
WITH_QEMU_LOCK_GUARD(&s->lock) {
parallels_check_unclean(bs, res, fix);
parallels_check_unclean(bs, res, fix);
ret = parallels_check_outside_image(bs, res, fix);
if (ret < 0) {
goto out;
}
ret = parallels_check_leak(bs, res, fix);
if (ret < 0) {
goto out;
}
parallels_collect_statistics(bs, res, fix);
out:
qemu_co_mutex_unlock(&s->lock);
if (ret == 0) {
ret = bdrv_co_flush(bs);
ret = parallels_check_outside_image(bs, res, fix);
if (ret < 0) {
res->check_errors++;
return ret;
}
ret = parallels_check_leak(bs, res, fix);
if (ret < 0) {
return ret;
}
parallels_collect_statistics(bs, res, fix);
}
ret = bdrv_co_flush(bs);
if (ret < 0) {
res->check_errors++;
}
return ret;