commit c0fc051dd475a3b76c9200c8bcb192710cdc1338
author Alexander Ivanov <alexander.ivanov@virtuozzo.com> Mon Apr 24 11:31:46 2023 +0200
committer Hanna Czenczek <hreitz@redhat.com> Mon Jun 05 13:13:58 2023 +0200
tree dac695326a6d8b37f3b5554b94e1716769b7a43f
parent 7e259e2540c542b5255c3e61938b6b94f8a82a31

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>

block/parallels.c

diff --git a/block/parallels.c b/block/parallels.c
index bb279dd..84d1d04 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -562,30 +562,25 @@
     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;