diff mbox

[v3,03/10] block: Use bdrv_nb_sectors() in bdrv_make_zero()

Message ID 1401473631-10724-4-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster May 30, 2014, 6:13 p.m. UTC 
Instead of bdrv_getlength().

Variable target_size is initially in bytes, then changes meaning to
sectors.  Ugh.  Replace by target_sectors.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 block.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

Comments

Benoît Canet June 2, 2014, 2:55 p.m. UTC | #1 
The Friday 30 May 2014 à 20:13:44 (+0200), Markus Armbruster wrote :
> Instead of bdrv_getlength().
> 
> Variable target_size is initially in bytes, then changes meaning to
> sectors.  Ugh.  Replace by target_sectors.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
>  block.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/block.c b/block.c
> index 14dc5fe..9517108 100644
> --- a/block.c
> +++ b/block.c
> @@ -2855,18 +2855,16 @@ int bdrv_write_zeroes(BlockDriverState *bs, int64_t sector_num,
>   */
>  int bdrv_make_zero(BlockDriverState *bs, BdrvRequestFlags flags)
>  {
> -    int64_t target_size;
> -    int64_t ret, nb_sectors, sector_num = 0;
> +    int64_t target_sectors, ret, nb_sectors, sector_num = 0;
>      int n;
>  
> -    target_size = bdrv_getlength(bs);
> -    if (target_size < 0) {
> -        return target_size;
> +    target_sectors = bdrv_nb_sectors(bs);
> +    if (target_sectors < 0) {
> +        return target_sectors;
>      }
> -    target_size /= BDRV_SECTOR_SIZE;
>  
>      for (;;) {
> -        nb_sectors = target_size - sector_num;
> +        nb_sectors = target_sectors - sector_num;
>          if (nb_sectors <= 0) {
>              return 0;
>          }
> -- 
> 1.9.3
> 
> 
Reviewed-by: Benoit Canet <benoit@irqsave.net>
diff mbox

Patch

diff --git a/block.c b/block.c
index 14dc5fe..9517108 100644
--- a/block.c
+++ b/block.c
@@ -2855,18 +2855,16 @@  int bdrv_write_zeroes(BlockDriverState *bs, int64_t sector_num,
  */
 int bdrv_make_zero(BlockDriverState *bs, BdrvRequestFlags flags)
 {
-    int64_t target_size;
-    int64_t ret, nb_sectors, sector_num = 0;
+    int64_t target_sectors, ret, nb_sectors, sector_num = 0;
     int n;
 
-    target_size = bdrv_getlength(bs);
-    if (target_size < 0) {
-        return target_size;
+    target_sectors = bdrv_nb_sectors(bs);
+    if (target_sectors < 0) {
+        return target_sectors;
     }
-    target_size /= BDRV_SECTOR_SIZE;
 
     for (;;) {
-        nb_sectors = target_size - sector_num;
+        nb_sectors = target_sectors - sector_num;
         if (nb_sectors <= 0) {
             return 0;
         }