From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45012) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfWfV-00023e-Io for qemu-devel@nongnu.org; Fri, 15 Jun 2012 09:34:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SfWfN-0004qB-7T for qemu-devel@nongnu.org; Fri, 15 Jun 2012 09:34:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54368) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SfWfM-0004pf-W3 for qemu-devel@nongnu.org; Fri, 15 Jun 2012 09:34:21 -0400 From: Kevin Wolf Date: Fri, 15 Jun 2012 15:33:27 +0200 Message-Id: <1339767219-24297-28-git-send-email-kwolf@redhat.com> In-Reply-To: <1339767219-24297-1-git-send-email-kwolf@redhat.com> References: <1339767219-24297-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 27/39] qcow2: Simplify calculation for COW area at the end List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org copy_sectors() always uses the sum (cluster_offset + n_start) or (start_sect + n_start), so if some value is added to both cluster_offset and start_sect, and subtracted from n_start, it's cancelled out anyway. Signed-off-by: Kevin Wolf --- block/qcow2-cluster.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 4eb5ba7..98fba71 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -642,11 +642,10 @@ int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m) } if (m->nb_available & (s->cluster_sectors - 1)) { - uint64_t end = m->nb_available & ~(uint64_t)(s->cluster_sectors - 1); cow = true; qemu_co_mutex_unlock(&s->lock); - ret = copy_sectors(bs, start_sect + end, cluster_offset + (end << 9), - m->nb_available - end, s->cluster_sectors); + ret = copy_sectors(bs, start_sect, cluster_offset, m->nb_available, + align_offset(m->nb_available, s->cluster_sectors)); qemu_co_mutex_lock(&s->lock); if (ret < 0) goto err; -- 1.7.6.5