Message ID | 1380023446-18176-1-git-send-email-mreitz@redhat.com |
---|---|
State | New |
Headers | show |
Am 24.09.2013 um 13:50 hat Max Reitz geschrieben: > 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> Thanks, applied to the block branch. Kevin
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 4264148..d2b7064 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,
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> --- block/qcow2-refcount.c | 1 - 1 file changed, 1 deletion(-)