[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 9/9] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_G
From: |
Alexander Ivanov |
Subject: |
[PATCH v5 9/9] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD |
Date: |
Mon, 22 Aug 2022 11:05:17 +0200 |
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>
---
block/parallels.c | 33 ++++++++++++++-------------------
1 file changed, 14 insertions(+), 19 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index 0fe6dd3237..47ef25b193 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -563,30 +563,25 @@ static int coroutine_fn
parallels_co_check(BlockDriverState *bs,
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.34.1
- Re: [PATCH v5 1/9] parallels: Out of image offset in BAT leads to image inflation, (continued)
Re: [PATCH v5 1/9] parallels: Out of image offset in BAT leads to image inflation, Denis V. Lunev, 2022/08/23
[PATCH v5 4/9] parallels: Use generic infrastructure for BAT writing in parallels_co_check(), Alexander Ivanov, 2022/08/22
[PATCH v5 3/9] parallels: create parallels_set_bat_entry_helper() to assign BAT value, Alexander Ivanov, 2022/08/22
[PATCH v5 5/9] parallels: Move check of unclean image to a separate function, Alexander Ivanov, 2022/08/22
[PATCH v5 6/9] parallels: Move check of cluster outside image to a separate function, Alexander Ivanov, 2022/08/22
[PATCH v5 9/9] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD,
Alexander Ivanov <=
[PATCH v5 2/9] parallels: Fix data_end field value in parallels_co_check(), Alexander Ivanov, 2022/08/22
[PATCH v5 7/9] parallels: Move check of leaks to a separate function, Alexander Ivanov, 2022/08/22
[PATCH v5 8/9] parallels: Move statistic collection to a separate function, Alexander Ivanov, 2022/08/22