| Message ID | 1408624579-22382-1-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
The Thursday 21 Aug 2014 à 14:36:19 (+0200), Markus Armbruster wrote : > Instead of bdrv_getlength(). > > Commit 57322b7 did this all over block, but one more bdrv_getlength() > has crept in since. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > v2: Actually use bdrv_nb_sectors() as advertized [Fam] > Passes ./check -T -vmdk -g quick > > block/vmdk.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/block/vmdk.c b/block/vmdk.c > index 01412a8..6ca8684 100644 > --- a/block/vmdk.c > +++ b/block/vmdk.c > @@ -397,7 +397,7 @@ static int vmdk_add_extent(BlockDriverState *bs, > { > VmdkExtent *extent; > BDRVVmdkState *s = bs->opaque; > - int64_t length; > + int64_t nb_sectors; > > if (cluster_sectors > 0x200000) { > /* 0x200000 * 512Bytes = 1GB for one cluster is unrealistic */ > @@ -413,9 +413,9 @@ static int vmdk_add_extent(BlockDriverState *bs, > return -EFBIG; > } > > - length = bdrv_getlength(file); > - if (length < 0) { > - return length; > + nb_sectors = bdrv_nb_sectors(file); > + if (nb_sectors < 0) { > + return nb_sectors; > } > > s->extents = g_realloc(s->extents, > @@ -433,8 +433,7 @@ static int vmdk_add_extent(BlockDriverState *bs, > extent->l1_entry_sectors = l2_size * cluster_sectors; > extent->l2_size = l2_size; > extent->cluster_sectors = flat ? sectors : cluster_sectors; > - extent->next_cluster_sector = > - ROUND_UP(DIV_ROUND_UP(length, BDRV_SECTOR_SIZE), cluster_sectors); > + extent->next_cluster_sector = ROUND_UP(nb_sectors, cluster_sectors); > > if (s->num_extents > 1) { > extent->end_sector = (*(extent - 1)).end_sector + extent->sectors; > -- > 1.9.3 > > Reviewed-by: Benoît Canet <benoit.canet@nodalink.com>
On Thu, 08/21 14:36, Markus Armbruster wrote: > Instead of bdrv_getlength(). > > Commit 57322b7 did this all over block, but one more bdrv_getlength() > has crept in since. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > v2: Actually use bdrv_nb_sectors() as advertized [Fam] > Passes ./check -T -vmdk -g quick > > block/vmdk.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/block/vmdk.c b/block/vmdk.c > index 01412a8..6ca8684 100644 > --- a/block/vmdk.c > +++ b/block/vmdk.c > @@ -397,7 +397,7 @@ static int vmdk_add_extent(BlockDriverState *bs, > { > VmdkExtent *extent; > BDRVVmdkState *s = bs->opaque; > - int64_t length; > + int64_t nb_sectors; > > if (cluster_sectors > 0x200000) { > /* 0x200000 * 512Bytes = 1GB for one cluster is unrealistic */ > @@ -413,9 +413,9 @@ static int vmdk_add_extent(BlockDriverState *bs, > return -EFBIG; > } > > - length = bdrv_getlength(file); > - if (length < 0) { > - return length; > + nb_sectors = bdrv_nb_sectors(file); > + if (nb_sectors < 0) { > + return nb_sectors; > } > > s->extents = g_realloc(s->extents, > @@ -433,8 +433,7 @@ static int vmdk_add_extent(BlockDriverState *bs, > extent->l1_entry_sectors = l2_size * cluster_sectors; > extent->l2_size = l2_size; > extent->cluster_sectors = flat ? sectors : cluster_sectors; > - extent->next_cluster_sector = > - ROUND_UP(DIV_ROUND_UP(length, BDRV_SECTOR_SIZE), cluster_sectors); > + extent->next_cluster_sector = ROUND_UP(nb_sectors, cluster_sectors); > > if (s->num_extents > 1) { > extent->end_sector = (*(extent - 1)).end_sector + extent->sectors; > -- > 1.9.3 > > Reviewed-by: Fam Zheng <famz@redhat.com>
Am 21.08.2014 um 14:36 hat Markus Armbruster geschrieben: > Instead of bdrv_getlength(). > > Commit 57322b7 did this all over block, but one more bdrv_getlength() > has crept in since. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > v2: Actually use bdrv_nb_sectors() as advertized [Fam] > Passes ./check -T -vmdk -g quick Thanks, applied to the block branch. Kevin
diff --git a/block/vmdk.c b/block/vmdk.c index 01412a8..6ca8684 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -397,7 +397,7 @@ static int vmdk_add_extent(BlockDriverState *bs, { VmdkExtent *extent; BDRVVmdkState *s = bs->opaque; - int64_t length; + int64_t nb_sectors; if (cluster_sectors > 0x200000) { /* 0x200000 * 512Bytes = 1GB for one cluster is unrealistic */ @@ -413,9 +413,9 @@ static int vmdk_add_extent(BlockDriverState *bs, return -EFBIG; } - length = bdrv_getlength(file); - if (length < 0) { - return length; + nb_sectors = bdrv_nb_sectors(file); + if (nb_sectors < 0) { + return nb_sectors; } s->extents = g_realloc(s->extents, @@ -433,8 +433,7 @@ static int vmdk_add_extent(BlockDriverState *bs, extent->l1_entry_sectors = l2_size * cluster_sectors; extent->l2_size = l2_size; extent->cluster_sectors = flat ? sectors : cluster_sectors; - extent->next_cluster_sector = - ROUND_UP(DIV_ROUND_UP(length, BDRV_SECTOR_SIZE), cluster_sectors); + extent->next_cluster_sector = ROUND_UP(nb_sectors, cluster_sectors); if (s->num_extents > 1) { extent->end_sector = (*(extent - 1)).end_sector + extent->sectors;
Instead of bdrv_getlength(). Commit 57322b7 did this all over block, but one more bdrv_getlength() has crept in since. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- v2: Actually use bdrv_nb_sectors() as advertized [Fam] Passes ./check -T -vmdk -g quick block/vmdk.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)