OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

parallels: refactor path when we need to re-check image in parallels_open

Browse Source 
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>
This commit is contained in:
Denis V. Lunev 2023-09-18 20:00:45 +02:00
parent e17b9d08d9
commit 8f5f532625
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
block/parallels.c
View File

@ -1071,7 +1071,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
int ret, size, i; int ret, size, i;
int64_t file_nb_sectors, sector; int64_t file_nb_sectors, sector;
uint32_t data_start; uint32_t data_start;
bool data_off_is_correct; bool need_check = false;
ret = parallels_opts_prealloc(bs, options, errp); ret = parallels_opts_prealloc(bs, options, errp);
if (ret < 0) { 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); s->bat_bitmap = (uint32_t *)(s->header + 1);
if (le32_to_cpu(ph.inuse) == HEADER_INUSE_MAGIC) { 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_start = data_start;
s->data_end = s->data_start; s->data_end = s->data_start;
if (s->data_end < (s->header_size >> BDRV_SECTOR_BITS)) { 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; 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 * 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; return 0;
} }
/* /* Repair the image if corruption was detected. */
* Repair the image if it's dirty or if (need_check) {
* out-of-image corruption was detected.
*/
if (s->data_end > file_nb_sectors || s->header_unclean
|| !data_off_is_correct) {
BdrvCheckResult res; BdrvCheckResult res;
ret = bdrv_check(bs, &res, BDRV_FIX_ERRORS | BDRV_FIX_LEAKS); ret = bdrv_check(bs, &res, BDRV_FIX_ERRORS | BDRV_FIX_LEAKS);
if (ret < 0) { if (ret < 0) {
@ -1223,7 +1223,6 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags,
goto fail; goto fail;
} }
} }
return 0; return 0;
fail_format: fail_format: