On 11.08.2022 17:00, Alexander Ivanov wrote:
> v2: Move unrelated helper parallels_set_bat_entry creation to
> a separate patch.
same notes as for previous patch
> Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
> ---
> block/parallels.c | 48 ++++++++++++++++++++++++++++++++++-------------
> 1 file changed, 35 insertions(+), 13 deletions(-)
>
> diff --git a/block/parallels.c b/block/parallels.c
> index c53b2810cf..12104ba5ad 100644
> --- a/block/parallels.c
> +++ b/block/parallels.c
> @@ -439,6 +439,36 @@ static void parallels_check_unclean(BlockDriverState *bs,
> }
> }
>
> +static int parallels_check_outside_image(BlockDriverState *bs,
> + BdrvCheckResult *res,
> + BdrvCheckMode fix)
> +{
> + BDRVParallelsState *s = bs->opaque;
> + uint32_t i;
> + int64_t off, size;
> +
> + size = bdrv_getlength(bs->file->bs);
> + if (size < 0) {
> + res->check_errors++;
> + return size;
> + }
> +
> + for (i = 0; i < s->bat_size; i++) {
> + off = bat2sect(s, i) << BDRV_SECTOR_BITS;
> + if (off > size) {
> + fprintf(stderr, "%s cluster %u is outside image\n",
> + fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR", i);
> + res->corruptions++;
> + if (fix & BDRV_FIX_ERRORS) {
> + parallels_set_bat_entry(s, i, 0);
> + res->corruptions_fixed++;
> + }
> + }
> + }
> +
> + return 0;
> +}
> +
> static int coroutine_fn parallels_co_check(BlockDriverState *bs,
> BdrvCheckResult *res,
> BdrvCheckMode fix)
> @@ -458,6 +488,11 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs,
>
> parallels_check_unclean(bs, res, fix);
>
> + ret = parallels_check_outside_image(bs, res, fix);
> + if (ret < 0) {
> + goto out;
> + }
> +
> res->bfi.total_clusters = s->bat_size;
> res->bfi.compressed_clusters = 0; /* compression is not supported */
>
> @@ -470,19 +505,6 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs,
> continue;
> }
>
> - /* cluster outside the image */
> - if (off > size) {
> - fprintf(stderr, "%s cluster %u is outside image\n",
> - fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR", i);
> - res->corruptions++;
> - if (fix & BDRV_FIX_ERRORS) {
> - prev_off = 0;
> - parallels_set_bat_entry(s, i, 0);
> - res->corruptions_fixed++;
> - continue;
> - }
> - }
> -
> res->bfi.allocated_clusters++;
> if (off > high_off) {
> high_off = off;