| Message ID | 20230701100759.261007-5-alexander.ivanov@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
| Series | parallels: Add duplication check, repair at open, fix bugs | expand |
On 7/1/23 12:07, Alexander Ivanov wrote: > In the next patch we will need the offset of the data area for host cluster > index calculation. Add this field and setting up code. > > Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com> > --- > block/parallels.c | 7 ++++--- > block/parallels.h | 1 + > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/block/parallels.c b/block/parallels.c > index 3cff25e3a4..374c9d17eb 100644 > --- a/block/parallels.c > +++ b/block/parallels.c > @@ -864,10 +864,11 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, > ret = -ENOMEM; > goto fail; > } > - s->data_end = le32_to_cpu(ph.data_off); > - if (s->data_end == 0) { > - s->data_end = DIV_ROUND_UP(size, BDRV_SECTOR_SIZE); > + s->data_start = le32_to_cpu(ph.data_off); > + if (s->data_start == 0) { > + s->data_start = DIV_ROUND_UP(size, BDRV_SECTOR_SIZE); > } > + s->data_end = s->data_start; > if (s->data_end < (s->header_size >> BDRV_SECTOR_BITS)) { > /* there is not enough unused space to fit to block align between BAT > and actual data. We can't avoid read-modify-write... */ > diff --git a/block/parallels.h b/block/parallels.h > index f22f43f988..4e53e9572d 100644 > --- a/block/parallels.h > +++ b/block/parallels.h > @@ -75,6 +75,7 @@ typedef struct BDRVParallelsState { > uint32_t *bat_bitmap; > unsigned int bat_size; > > + int64_t data_start; > int64_t data_end; > uint64_t prealloc_size; > ParallelsPreallocMode prealloc_mode; Reviewed-by: Denis V. Lunev <den@openvz.org>
diff --git a/block/parallels.c b/block/parallels.c index 3cff25e3a4..374c9d17eb 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -864,10 +864,11 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, ret = -ENOMEM; goto fail; } - s->data_end = le32_to_cpu(ph.data_off); - if (s->data_end == 0) { - s->data_end = DIV_ROUND_UP(size, BDRV_SECTOR_SIZE); + s->data_start = le32_to_cpu(ph.data_off); + if (s->data_start == 0) { + s->data_start = DIV_ROUND_UP(size, BDRV_SECTOR_SIZE); } + s->data_end = s->data_start; if (s->data_end < (s->header_size >> BDRV_SECTOR_BITS)) { /* there is not enough unused space to fit to block align between BAT and actual data. We can't avoid read-modify-write... */ diff --git a/block/parallels.h b/block/parallels.h index f22f43f988..4e53e9572d 100644 --- a/block/parallels.h +++ b/block/parallels.h @@ -75,6 +75,7 @@ typedef struct BDRVParallelsState { uint32_t *bat_bitmap; unsigned int bat_size; + int64_t data_start; int64_t data_end; uint64_t prealloc_size; ParallelsPreallocMode prealloc_mode;
In the next patch we will need the offset of the data area for host cluster index calculation. Add this field and setting up code. Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com> --- block/parallels.c | 7 ++++--- block/parallels.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-)