Re: [Qemu-devel] [PATCH] qcow2: Remove useless count_contiguous_clusters() parameter

[Jeff Cody]

On Fri, Sep 27, 2013 at 01:51:10PM +0200, Kevin Wolf wrote:
> All callers pass start = 0, and it's doubtful if any other value would
> actually do what you expect. Remove the parameter.
> 
> Signed-off-by: Kevin Wolf <address@hidden>

Reviewed-by: Jeff Cody <address@hidden>

> ---
>  block/qcow2-cluster.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
> index 029c805..72cb573 100644
> --- a/block/qcow2-cluster.c
> +++ b/block/qcow2-cluster.c
> @@ -285,7 +285,7 @@ fail:
>   * cluster which may require a different handling)
>   */
>  static int count_contiguous_clusters(uint64_t nb_clusters, int cluster_size,
> -        uint64_t *l2_table, uint64_t start, uint64_t stop_flags)
> +        uint64_t *l2_table, uint64_t stop_flags)
>  {
>      int i;
>      uint64_t mask = stop_flags | L2E_OFFSET_MASK | QCOW2_CLUSTER_COMPRESSED;
> @@ -297,14 +297,14 @@ static int count_contiguous_clusters(uint64_t 
> nb_clusters, int cluster_size,
>  
>      assert(qcow2_get_cluster_type(first_entry) != QCOW2_CLUSTER_COMPRESSED);
>  
> -    for (i = start; i < start + nb_clusters; i++) {
> +    for (i = 0; i < nb_clusters; i++) {
>          uint64_t l2_entry = be64_to_cpu(l2_table[i]) & mask;
>          if (offset + (uint64_t) i * cluster_size != l2_entry) {
>              break;
>          }
>      }
>  
> -     return (i - start);
> +     return i;
>  }
>  
>  static int count_contiguous_free_clusters(uint64_t nb_clusters, uint64_t 
> *l2_table)
> @@ -497,7 +497,7 @@ int qcow2_get_cluster_offset(BlockDriverState *bs, 
> uint64_t offset,
>              return -EIO;
>          }
>          c = count_contiguous_clusters(nb_clusters, s->cluster_size,
> -                &l2_table[l2_index], 0, QCOW_OFLAG_ZERO);
> +                &l2_table[l2_index], QCOW_OFLAG_ZERO);
>          *cluster_offset = 0;
>          break;
>      case QCOW2_CLUSTER_UNALLOCATED:
> @@ -508,7 +508,7 @@ int qcow2_get_cluster_offset(BlockDriverState *bs, 
> uint64_t offset,
>      case QCOW2_CLUSTER_NORMAL:
>          /* how many allocated clusters ? */
>          c = count_contiguous_clusters(nb_clusters, s->cluster_size,
> -                &l2_table[l2_index], 0, QCOW_OFLAG_ZERO);
> +                &l2_table[l2_index], QCOW_OFLAG_ZERO);
>          *cluster_offset &= L2E_OFFSET_MASK;
>          break;
>      default:
> @@ -938,7 +938,7 @@ static int handle_copied(BlockDriverState *bs, uint64_t 
> guest_offset,
>          /* We keep all QCOW_OFLAG_COPIED clusters */
>          keep_clusters =
>              count_contiguous_clusters(nb_clusters, s->cluster_size,
> -                                      &l2_table[l2_index], 0,
> +                                      &l2_table[l2_index],
>                                        QCOW_OFLAG_COPIED | QCOW_OFLAG_ZERO);
>          assert(keep_clusters <= nb_clusters);
>  
> -- 
> 1.8.1.4
> 
>