From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPV4C-0002Or-1P for qemu-devel@nongnu.org; Fri, 27 Sep 2013 06:14:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VPV44-0005pp-8c for qemu-devel@nongnu.org; Fri, 27 Sep 2013 06:14:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60553) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPV44-0005pi-1K for qemu-devel@nongnu.org; Fri, 27 Sep 2013 06:14:24 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8RAEMNR027077 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 27 Sep 2013 06:14:23 -0400 From: Max Reitz Date: Fri, 27 Sep 2013 12:14:16 +0200 Message-Id: <1380276856-29777-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1380276856-29777-1-git-send-email-mreitz@redhat.com> References: <1380276856-29777-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v2 2/2] qcow2: COMPRESSED on count_contiguous_clusters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz Compressed clusters can never be contiguous, therefore the corresponding flag does not need to be given explicitly to count_contiguous_clusters. Signed-off-by: Max Reitz --- block/qcow2-cluster.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index a62ef42..145fa18 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -490,8 +490,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_COMPRESSED | QCOW_OFLAG_ZERO); + &l2_table[l2_index], 0, QCOW_OFLAG_ZERO); *cluster_offset = 0; break; case QCOW2_CLUSTER_UNALLOCATED: @@ -502,8 +501,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_COMPRESSED | QCOW_OFLAG_ZERO); + &l2_table[l2_index], 0, QCOW_OFLAG_ZERO); *cluster_offset &= L2E_OFFSET_MASK; break; default: -- 1.8.3.1