| Message ID | 20220822090517.2289697-5-alexander.ivanov@virtuozzo.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | parallels: Refactor the code of images checks and fix a bug | expand |
On 22.08.2022 11:05, Alexander Ivanov wrote: > BAT is written in the context of conventional operations over > the image inside bdrv_co_flush() when it calls > parallels_co_flush_to_os() callback. Thus we should not > modify BAT array directly, but call parallels_set_bat_entry() > helper and bdrv_co_flush() further on. After that there is no > need to manually write BAT and track its modification. > > This makes code more generic and allows to split > parallels_set_bat_entry() for independent pieces. > > Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com> > --- > block/parallels.c | 23 ++++++++++------------- > 1 file changed, 10 insertions(+), 13 deletions(-) > > diff --git a/block/parallels.c b/block/parallels.c > index 8733ef8a70..357c345517 100644 > --- a/block/parallels.c > +++ b/block/parallels.c > @@ -425,9 +425,8 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs, > { > BDRVParallelsState *s = bs->opaque; > int64_t size, prev_off, high_off; > - int ret; > + int ret = 0; > uint32_t i; > - bool flush_bat = false; > > size = bdrv_getlength(bs->file->bs); > if (size < 0) { > @@ -466,9 +465,8 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs, > res->corruptions++; > if (fix & BDRV_FIX_ERRORS) { > prev_off = 0; > - s->bat_bitmap[i] = 0; > + parallels_set_bat_entry(s, i, 0); > res->corruptions_fixed++; > - flush_bat = true; > continue; > } > } > @@ -484,15 +482,6 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs, > prev_off = off; > } > > - ret = 0; > - if (flush_bat) { > - ret = bdrv_co_pwrite_sync(bs->file, 0, s->header_size, s->header, 0); > - if (ret < 0) { > - res->check_errors++; > - goto out; > - } > - } > - > res->image_end_offset = high_off + s->cluster_size; > if (size > res->image_end_offset) { > int64_t count; > @@ -529,6 +518,14 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs, > s->data_end = size >> BDRV_SECTOR_BITS; > out: > qemu_co_mutex_unlock(&s->lock); > + > + if (ret == 0) { > + ret = bdrv_co_flush(bs); > + if (ret < 0) { > + res->check_errors++; > + } > + } > + > return ret; > } > Reviewed-by: Denis V. Lunev <den@openvz.org>
diff --git a/block/parallels.c b/block/parallels.c index 8733ef8a70..357c345517 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -425,9 +425,8 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs, { BDRVParallelsState *s = bs->opaque; int64_t size, prev_off, high_off; - int ret; + int ret = 0; uint32_t i; - bool flush_bat = false; size = bdrv_getlength(bs->file->bs); if (size < 0) { @@ -466,9 +465,8 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs, res->corruptions++; if (fix & BDRV_FIX_ERRORS) { prev_off = 0; - s->bat_bitmap[i] = 0; + parallels_set_bat_entry(s, i, 0); res->corruptions_fixed++; - flush_bat = true; continue; } } @@ -484,15 +482,6 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs, prev_off = off; } - ret = 0; - if (flush_bat) { - ret = bdrv_co_pwrite_sync(bs->file, 0, s->header_size, s->header, 0); - if (ret < 0) { - res->check_errors++; - goto out; - } - } - res->image_end_offset = high_off + s->cluster_size; if (size > res->image_end_offset) { int64_t count; @@ -529,6 +518,14 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs, s->data_end = size >> BDRV_SECTOR_BITS; out: qemu_co_mutex_unlock(&s->lock); + + if (ret == 0) { + ret = bdrv_co_flush(bs); + if (ret < 0) { + res->check_errors++; + } + } + return ret; }
BAT is written in the context of conventional operations over the image inside bdrv_co_flush() when it calls parallels_co_flush_to_os() callback. Thus we should not modify BAT array directly, but call parallels_set_bat_entry() helper and bdrv_co_flush() further on. After that there is no need to manually write BAT and track its modification. This makes code more generic and allows to split parallels_set_bat_entry() for independent pieces. Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com> --- block/parallels.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)