aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorAlexander Ivanov <alexander.ivanov@virtuozzo.com>2023-04-24 11:31:46 +0200
committerHanna Czenczek <hreitz@redhat.com>2023-06-05 13:13:58 +0200
commitc0fc051dd475a3b76c9200c8bcb192710cdc1338 (patch)
treedac695326a6d8b37f3b5554b94e1716769b7a43f /block
parent7e259e2540c542b5255c3e61938b6b94f8a82a31 (diff)
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>
Diffstat (limited to 'block')
-rw-r--r--block/parallels.c33
1 files changed, 14 insertions, 19 deletions
diff --git a/block/parallels.c b/block/parallels.c
index bb279ddc70..84d1d045ad 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -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) {
+ return ret;
+ }
- ret = parallels_check_outside_image(bs, res, fix);
- if (ret < 0) {
- goto out;
- }
+ ret = parallels_check_leak(bs, res, fix);
+ if (ret < 0) {
+ return ret;
+ }
- ret = parallels_check_leak(bs, res, fix);
- if (ret < 0) {
- goto out;
+ parallels_collect_statistics(bs, res, fix);
}
- parallels_collect_statistics(bs, res, fix);
-
-out:
- qemu_co_mutex_unlock(&s->lock);
-
- if (ret == 0) {
- ret = bdrv_co_flush(bs);
- if (ret < 0) {
- res->check_errors++;
- }
+ ret = bdrv_co_flush(bs);
+ if (ret < 0) {
+ res->check_errors++;
}
return ret;