| Message ID | 20170418013356.3578-30-eblake@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am 18.04.2017 um 03:33 hat Eric Blake geschrieben: > We are gradually moving away from sector-based interfaces, towards > byte-based. Update the vpc driver accordingly. > > Signed-off-by: Eric Blake <eblake@redhat.com> I know this is an old series, but I think you split it for later versions and there hasn't been a respin of this final part of the series yet. When I just told Peter that get_sector_offset() would go away with your patches, I decided to check whether this was actually true, and found... > /* *pnum can't be greater than one block for allocated > * sectors since there is always a bitmap in between. */ > if (allocated) { > *file = bs->file->bs; > return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | start; > } > - if (nb_sectors == 0) { > + if (bytes == 0) { > break; > } > - offset = get_sector_offset(bs, sector_num, 0); > + image_offset = get_sector_offset(bs, offset, 0); > } while (offset == -1); ...this bug. I think you want to use get_image_offset() now. This should also be the last caller of get_sector_offset(), so the function should go away in this commit. Kevin
On 07/13/2017 07:55 AM, Kevin Wolf wrote: > Am 18.04.2017 um 03:33 hat Eric Blake geschrieben: >> We are gradually moving away from sector-based interfaces, towards >> byte-based. Update the vpc driver accordingly. >> >> Signed-off-by: Eric Blake <eblake@redhat.com> > > I know this is an old series, but I think you split it for later > versions and there hasn't been a respin of this final part of the series > yet. Yep, the respin should be coming up later today. > > When I just told Peter that get_sector_offset() would go away with your > patches, I decided to check whether this was actually true, and found... > >> /* *pnum can't be greater than one block for allocated >> * sectors since there is always a bitmap in between. */ >> if (allocated) { >> *file = bs->file->bs; >> return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | start; >> } >> - if (nb_sectors == 0) { >> + if (bytes == 0) { >> break; >> } >> - offset = get_sector_offset(bs, sector_num, 0); >> + image_offset = get_sector_offset(bs, offset, 0); >> } while (offset == -1); > > ...this bug. I think you want to use get_image_offset() now. > > This should also be the last caller of get_sector_offset(), so the > function should go away in this commit. Will do, and thanks for catching it!
diff --git a/block/vpc.c b/block/vpc.c index ecfee77..3cd56e7 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -689,46 +689,45 @@ fail: return ret; } -static int64_t coroutine_fn vpc_co_get_block_status(BlockDriverState *bs, - int64_t sector_num, int nb_sectors, int *pnum, BlockDriverState **file) +static int64_t coroutine_fn vpc_co_block_status(BlockDriverState *bs, + int64_t offset, int64_t bytes, int64_t *pnum, BlockDriverState **file) { BDRVVPCState *s = bs->opaque; VHDFooter *footer = (VHDFooter*) s->footer_buf; - int64_t start, offset; + int64_t start, image_offset; bool allocated; int n; if (be32_to_cpu(footer->type) == VHD_FIXED) { - *pnum = nb_sectors; + *pnum = bytes; *file = bs->file->bs; return BDRV_BLOCK_RAW | BDRV_BLOCK_OFFSET_VALID | BDRV_BLOCK_DATA | - (sector_num << BDRV_SECTOR_BITS); + (offset & BDRV_BLOCK_OFFSET_MASK); } - offset = get_sector_offset(bs, sector_num, 0); - start = offset; - allocated = (offset != -1); + image_offset = get_image_offset(bs, offset, 0); + start = image_offset & BDRV_BLOCK_OFFSET_MASK; + allocated = (image_offset != -1); *pnum = 0; do { /* All sectors in a block are contiguous (without using the bitmap) */ - n = ROUND_UP(sector_num + 1, s->block_size / BDRV_SECTOR_SIZE) - - sector_num; - n = MIN(n, nb_sectors); + n = ROUND_UP(offset + 1, s->block_size) - offset; + n = MIN(n, bytes); *pnum += n; - sector_num += n; - nb_sectors -= n; + offset += n; + bytes -= n; /* *pnum can't be greater than one block for allocated * sectors since there is always a bitmap in between. */ if (allocated) { *file = bs->file->bs; return BDRV_BLOCK_DATA | BDRV_BLOCK_OFFSET_VALID | start; } - if (nb_sectors == 0) { + if (bytes == 0) { break; } - offset = get_sector_offset(bs, sector_num, 0); + image_offset = get_sector_offset(bs, offset, 0); } while (offset == -1); return 0; @@ -1074,7 +1073,7 @@ static BlockDriver bdrv_vpc = { .bdrv_co_preadv = vpc_co_preadv, .bdrv_co_pwritev = vpc_co_pwritev, - .bdrv_co_get_block_status = vpc_co_get_block_status, + .bdrv_co_block_status = vpc_co_block_status, .bdrv_get_info = vpc_get_info,
We are gradually moving away from sector-based interfaces, towards byte-based. Update the vpc driver accordingly. Signed-off-by: Eric Blake <eblake@redhat.com> --- block/vpc.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-)