[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 8/8] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_G
From: |
Alexander Ivanov |
Subject: |
[PATCH v2 8/8] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD |
Date: |
Thu, 11 Aug 2022 17:00:44 +0200 |
Replace the way we use mutex in parallels_co_check() for more clean code.
v2: Fix an incorrect usage of WITH_QEMU_LOCK_GUARD.
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
---
block/parallels.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index d0364182bb..e124a8bb7d 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -553,24 +553,22 @@ 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) {
- goto out;
- }
+ ret = parallels_check_leak(bs, res, fix);
+ if (ret < 0) {
+ return ret;
+ }
- parallels_collect_statistics(bs, res, fix);
+ parallels_collect_statistics(bs, res, fix);
-out:
- qemu_co_mutex_unlock(&s->lock);
+ }
ret = bdrv_co_flush(bs);
if (ret < 0) {
--
2.34.1
- [PATCH v2 3/8] parallels: Replace bdrv_co_pwrite_sync by bdrv_co_flush for BAT flushing, (continued)
- [PATCH v2 3/8] parallels: Replace bdrv_co_pwrite_sync by bdrv_co_flush for BAT flushing, Alexander Ivanov, 2022/08/11
- [PATCH v2 7/8] parallels: Move statistic collection to a separate function, Alexander Ivanov, 2022/08/11
- [PATCH v2 4/8] parallels: Move check of unclean image to a separate function, Alexander Ivanov, 2022/08/11
- [PATCH v2 5/8] parallels: Move check of cluster outside image to a separate function, Alexander Ivanov, 2022/08/11
- [PATCH v2 1/8] parallels: Out of image offset in BAT leads to image inflation, Alexander Ivanov, 2022/08/11
- [PATCH v2 8/8] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD,
Alexander Ivanov <=
- [PATCH v2 2/8] parallels: Move BAT entry setting to a separate function, Alexander Ivanov, 2022/08/11
- [PATCH v2 6/8] parallels: Move check of leaks to a separate function, Alexander Ivanov, 2022/08/11
- Re: [PATCH v2 0/8] parallels: Refactor the code of images checks and fix a bug, Denis V. Lunev, 2022/08/12