Re: [Qemu-devel] [PATCH v3 04/10] block: Use bdrv_nb_sectors() in bdrv_aligned_preadv()

["Benoît Canet" <benoit.canet@irqsave.net>]

The Friday 30 May 2014 à 20:13:45 (+0200), Markus Armbruster wrote :
> Instead of bdrv_getlength().  Eliminate variable len.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
>  block.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/block.c b/block.c
> index 9517108..6639d09 100644
> --- a/block.c
> +++ b/block.c
> @@ -3081,15 +3081,14 @@ static int coroutine_fn bdrv_aligned_preadv(BlockDriverState *bs,
>          ret = drv->bdrv_co_readv(bs, sector_num, nb_sectors, qiov);
>      } else {
>          /* Read zeros after EOF of growable BDSes */
> -        int64_t len, total_sectors, max_nb_sectors;
> +        int64_t total_sectors, max_nb_sectors;
>  
> -        len = bdrv_getlength(bs);
> -        if (len < 0) {
> -            ret = len;
> +        total_sectors = bdrv_nb_sectors(bs);
> +        if (total_sectors < 0) {
> +            ret = total_sectors;
>              goto out;
>          }
>  
> -        total_sectors = DIV_ROUND_UP(len, BDRV_SECTOR_SIZE);
>          max_nb_sectors = ROUND_UP(MAX(0, total_sectors - sector_num),
>                                    align >> BDRV_SECTOR_BITS);
>          if (max_nb_sectors > 0) {
> -- 
> 1.9.3
> 
> 
Reviewed-by: Benoit Canet <benoit@irqsave.net>