From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPa9c-0007Fz-47 for qemu-devel@nongnu.org; Fri, 27 Sep 2013 11:40:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VPa9W-0007u4-5Y for qemu-devel@nongnu.org; Fri, 27 Sep 2013 11:40:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38933) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPa9V-0007tv-UF for qemu-devel@nongnu.org; Fri, 27 Sep 2013 11:40:22 -0400 From: Kevin Wolf Date: Fri, 27 Sep 2013 17:39:29 +0200 Message-Id: <1380296370-14523-30-git-send-email-kwolf@redhat.com> In-Reply-To: <1380296370-14523-1-git-send-email-kwolf@redhat.com> References: <1380296370-14523-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 29/30] qcow2: COMPRESSED on count_contiguous_clusters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: 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 Signed-off-by: Kevin Wolf --- 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 8b2361a..f93960f 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -493,8 +493,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: @@ -505,8 +504,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.1.4