[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/17] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUA
From: |
Hanna Czenczek |
Subject: |
[PULL 15/17] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD |
Date: |
Mon, 5 Jun 2023 17:45:39 +0200 |
From: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
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 | 33 ++++++++++++++-------------------
1 file 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;
--
2.40.1
- Re: [PULL 05/17] parallels: Out of image offset in BAT leads to image inflation, (continued)
[PULL 06/17] parallels: Fix high_off calculation in parallels_co_check(), Hanna Czenczek, 2023/06/05
[PULL 04/17] iotests/iov-padding: New test, Hanna Czenczek, 2023/06/05
[PULL 11/17] parallels: Move check of cluster outside image to a separate function, Hanna Czenczek, 2023/06/05
[PULL 10/17] parallels: Move check of unclean image to a separate function, Hanna Czenczek, 2023/06/05
[PULL 12/17] parallels: Fix statistics calculation, Hanna Czenczek, 2023/06/05
[PULL 07/17] parallels: Fix image_end_offset and data_end after out-of-image check, Hanna Czenczek, 2023/06/05
[PULL 17/17] qcow2: add discard-no-unref option, Hanna Czenczek, 2023/06/05
[PULL 15/17] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD,
Hanna Czenczek <=
[PULL 09/17] parallels: Use generic infrastructure for BAT writing in parallels_co_check(), Hanna Czenczek, 2023/06/05
[PULL 08/17] parallels: create parallels_set_bat_entry_helper() to assign BAT value, Hanna Czenczek, 2023/06/05
[PULL 13/17] parallels: Move check of leaks to a separate function, Hanna Czenczek, 2023/06/05
[PULL 14/17] parallels: Move statistic collection to a separate function, Hanna Czenczek, 2023/06/05
[PULL 16/17] parallels: Incorrect condition in out-of-image check, Hanna Czenczek, 2023/06/05
Re: [PULL 00/17] Block patches, Richard Henderson, 2023/06/05