diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2012-05-22 16:58:48 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-06-15 14:03:43 +0200 |
| commit | cdba7fee1daa8865bac2d69da288171fe7c21aae (patch) | |
| tree | 6a9dd8e7fc5a2646dadc177e42414a886fba290b | |
| parent | 6af4e9ead4ec9491259c9861b1b35f9abee24a66 (diff) | |
qcow2: Simplify calculation for COW area at the end
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 <kwolf@redhat.com>
| -rw-r--r-- | 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 4eb5ba7772..98fba71fd7 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; |