From: "Denis V. Lunev" <den@openvz.org>
To: qemu-block@nongnu.org, qemu-devel@nongnu.org
Cc: stefanha@redhat.com, alexander.ivanov@virtuozzo.com,
mike.maslenkin@gmail.com, "Denis V. Lunev" <den@openvz.org>
Subject: [PATCH 07/22] parallels: refactor path when we need to re-check image in parallels_open
Date: Mon, 18 Sep 2023 20:00:45 +0200 [thread overview]
Message-ID: <20230918180100.524843-9-den@openvz.org> (raw)
In-Reply-To: <20230918180100.524843-1-den@openvz.org>
More conditions follows thus the check should be more scalable.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
---
block/parallels.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index bd26c8db63..af3b4894d7 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -1071,7 +1071,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
int ret, size, i;
int64_t file_nb_sectors, sector;
uint32_t data_start;
- bool data_off_is_correct;
+ bool need_check = false;
ret = parallels_opts_prealloc(bs, options, errp);
if (ret < 0) {
@@ -1139,11 +1139,14 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
s->bat_bitmap = (uint32_t *)(s->header + 1);
if (le32_to_cpu(ph.inuse) == HEADER_INUSE_MAGIC) {
- s->header_unclean = true;
+ need_check = s->header_unclean = true;
+ }
+
+ {
+ bool ok = parallels_test_data_off(s, file_nb_sectors, &data_start);
+ need_check = need_check || !ok;
}
- data_off_is_correct = parallels_test_data_off(s, file_nb_sectors,
- &data_start);
s->data_start = data_start;
s->data_end = s->data_start;
if (s->data_end < (s->header_size >> BDRV_SECTOR_BITS)) {
@@ -1200,6 +1203,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
s->data_end = sector + s->tracks;
}
}
+ need_check = need_check || s->data_end > file_nb_sectors;
/*
* We don't repair the image here if it's opened for checks. Also we don't
@@ -1209,12 +1213,8 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
return 0;
}
- /*
- * Repair the image if it's dirty or
- * out-of-image corruption was detected.
- */
- if (s->data_end > file_nb_sectors || s->header_unclean
- || !data_off_is_correct) {
+ /* Repair the image if corruption was detected. */
+ if (need_check) {
BdrvCheckResult res;
ret = bdrv_check(bs, &res, BDRV_FIX_ERRORS | BDRV_FIX_LEAKS);
if (ret < 0) {
@@ -1223,7 +1223,6 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
goto fail;
}
}
-
return 0;
fail_format:
--
2.34.1
next prev parent reply other threads:[~2023-09-18 18:02 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-18 18:00 [PATCH v2 00/22] implement discard operation for Parallels images Denis V. Lunev
2023-09-18 18:00 ` [PATCH 01/22] parallels: fix formatting in bdrv_parallels initialization Denis V. Lunev
2023-09-18 18:00 ` [PATCH 02/22] parallels: mark driver as supporting CBT Denis V. Lunev
2023-09-18 18:00 ` [PATCH 03/22] parallels: fix memory leak in parallels_open() Denis V. Lunev
2023-09-19 9:28 ` Alexander Ivanov
2023-09-18 18:00 ` [PATCH 3/3] tests: extend test 131 to cover availability of the write-zeroes Denis V. Lunev
2023-09-18 18:05 ` Denis V. Lunev
2023-09-18 18:00 ` [PATCH 04/22] parallels: invent parallels_opts_prealloc() helper to parse prealloc opts Denis V. Lunev
2023-09-19 9:34 ` Alexander Ivanov
2023-09-18 18:00 ` [PATCH 05/22] parallels: return earler in fail_format branch in parallels_open() Denis V. Lunev
2023-09-18 18:00 ` [PATCH 06/22] parallels: return earlier from parallels_open() function on error Denis V. Lunev
2023-09-18 18:00 ` Denis V. Lunev [this message]
2023-09-18 18:00 ` [PATCH 08/22] parallels: create mark_used() helper which sets bit in used bitmap Denis V. Lunev
2023-09-18 18:00 ` [PATCH 09/22] tests: ensure that image validation will not cure the corruption Denis V. Lunev
2023-09-18 18:00 ` [PATCH 10/22] parallels: fix broken parallels_check_data_off() Denis V. Lunev
2023-09-18 18:00 ` [PATCH 11/22] parallels: add test which will validate data_off fixes through repair Denis V. Lunev
2023-09-18 18:00 ` [PATCH 12/22] parallels: collect bitmap of used clusters at open Denis V. Lunev
2023-09-18 18:00 ` [PATCH 13/22] tests: fix broken deduplication check in parallels format test Denis V. Lunev
2023-09-18 18:00 ` [PATCH 14/22] tests: test self-cure of parallels image with duplicated clusters Denis V. Lunev
2023-09-18 18:00 ` [PATCH 15/22] parallels: accept multiple clusters in mark_used() Denis V. Lunev
2023-09-18 18:00 ` [PATCH 16/22] parallels: update used bitmap in allocate_cluster Denis V. Lunev
2023-09-18 18:00 ` [PATCH 17/22] parallels: naive implementation of allocate_clusters with used bitmap Denis V. Lunev
2023-09-18 18:00 ` [PATCH 18/22] parallels: improve readability of allocate_clusters Denis V. Lunev
2023-09-18 18:00 ` [PATCH 19/22] parallels: naive implementation of parallels_co_pdiscard Denis V. Lunev
2023-09-19 9:42 ` Alexander Ivanov
2023-09-18 18:00 ` [PATCH 20/22] tests: extend test 131 to cover availability of the discard operation Denis V. Lunev
2023-09-19 9:56 ` Alexander Ivanov
2023-09-18 18:00 ` [PATCH 21/22] parallels: naive implementation of parallels_co_pwrite_zeroes Denis V. Lunev
2023-09-18 18:01 ` [PATCH 22/22] tests: extend test 131 to cover availability of the write-zeroes Denis V. Lunev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230918180100.524843-9-den@openvz.org \
--to=den@openvz.org \
--cc=alexander.ivanov@virtuozzo.com \
--cc=mike.maslenkin@gmail.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).