From: Max Reitz <mreitz@redhat.com>
Date: Tue, 24 Sep 2013 11:50:46 +0000 (+0200)
Subject: qcow2: Don't shadow return value
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7454d600457f75f4fda6bf7be027fd3bcf7d5220;p=qemu.git

qcow2: Don't shadow return value

When trying to update the refcounts for a snapshot, the return value of
update_refcount on a compressed cluster was pretty much ignored,
cancelling the update on error but returning 0. This is caused by an
inner "ret" variable shadowing the outer one (the latter is used in the
return statement).

Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 4264148142..d2b7064a02 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -874,7 +874,6 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs,
                         nb_csectors = ((offset >> s->csize_shift) &
                                        s->csize_mask) + 1;
                         if (addend != 0) {
-                            int ret;
                             ret = update_refcount(bs,
                                 (offset & s->cluster_offset_mask) & ~511,
                                 nb_csectors * 512, addend,