[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 10/10] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK
From: |
Alexander Ivanov |
Subject: |
[PATCH v6 10/10] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD |
Date: |
Thu, 25 Aug 2022 16:31:09 +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 eacfdea4b6..8943eccbf5 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -561,30 +561,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
- [PATCH v6 01/10] parallels: Out of image offset in BAT leads to image inflation, (continued)
- [PATCH v6 01/10] parallels: Out of image offset in BAT leads to image inflation, Alexander Ivanov, 2022/08/25
- [PATCH v6 05/10] parallels: Use generic infrastructure for BAT writing in parallels_co_check(), Alexander Ivanov, 2022/08/25
- [PATCH v6 02/10] parallels: Fix high_off calculation in parallels_co_check(), Alexander Ivanov, 2022/08/25
- [PATCH v6 09/10] parallels: Move statistic collection to a separate function, Alexander Ivanov, 2022/08/25
- [PATCH v6 08/10] parallels: Move check of leaks to a separate function, Alexander Ivanov, 2022/08/25
- [PATCH v6 03/10] parallels: Fix data_end after out-of-image check, Alexander Ivanov, 2022/08/25
- [PATCH v6 10/10] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD,
Alexander Ivanov <=
- [PATCH v6 04/10] parallels: create parallels_set_bat_entry_helper() to assign BAT value, Alexander Ivanov, 2022/08/25
- [PATCH v6 11/10] parallels: Incorrect condition in out-of-image check, Alexander Ivanov, 2022/08/26
- [PATCH v7 02/10] parallels: Fix high_off calculation in parallels_co_check(), Alexander Ivanov, 2022/08/29
- [PATCH v7 04/10] parallels: create parallels_set_bat_entry_helper() to assign BAT value, Alexander Ivanov, 2022/08/29
- [PATCH v7 03/10] parallels: Fix data_end after out-of-image check, Alexander Ivanov, 2022/08/29
- [PATCH v7 05/10] parallels: Use generic infrastructure for BAT writing in parallels_co_check(), Alexander Ivanov, 2022/08/29
- [PATCH v7 11/10] parallels: Incorrect condition in out-of-image check, Alexander Ivanov, 2022/08/29
- [PATCH v7 07/10] parallels: Move check of cluster outside image to a separate function, Alexander Ivanov, 2022/08/29
- [PATCH v7 06/10] parallels: Move check of unclean image to a separate function, Alexander Ivanov, 2022/08/29