diff options
| author | Denis V. Lunev <den@openvz.org> | 2023-09-18 20:00:45 +0200 |
|---|---|---|
| committer | Denis V. Lunev <den@openvz.org> | 2023-09-21 08:46:22 +0200 |
| commit | 8f5f5326250791ceb597b486ff52d8ea83d6c2b0 (patch) | |
| tree | 4ac3fb103aa779c55d4b6a47015fb7b310847ddb | |
| parent | e17b9d08d90bdbbe2bc4d63d758ae2cb9ba806a6 (diff) | |
| download | qemu-8f5f5326250791ceb597b486ff52d8ea83d6c2b0.zip qemu-8f5f5326250791ceb597b486ff52d8ea83d6c2b0.tar.gz qemu-8f5f5326250791ceb597b486ff52d8ea83d6c2b0.tar.bz2 | |
parallels: refactor path when we need to re-check image in parallels_open
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>
| -rw-r--r-- | block/parallels.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/block/parallels.c b/block/parallels.c index bd26c8d..af3b489 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: |