From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0V7K-0001SE-HZ for qemu-devel@nongnu.org; Mon, 15 Dec 2014 07:51:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0V7E-0007kO-Dl for qemu-devel@nongnu.org; Mon, 15 Dec 2014 07:51:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40562) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0V7E-0007k9-5Z for qemu-devel@nongnu.org; Mon, 15 Dec 2014 07:51:08 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sBFCp6GZ013048 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 15 Dec 2014 07:51:07 -0500 From: Max Reitz Date: Mon, 15 Dec 2014 13:50:34 +0100 Message-Id: <1418647857-3589-4-git-send-email-mreitz@redhat.com> In-Reply-To: <1418647857-3589-1-git-send-email-mreitz@redhat.com> References: <1418647857-3589-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v5 03/26] qcow2: Do not return new value after refcount update List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz qcow2_update_cluster_refcount() does not have any quick access to the new refcount value, it has to call qcow2_get_refcount(). Some callers do not need that new value at all, others call qcow2_get_refcount() themselves anyway (albeit in a different code path, which can however be easily changed), therefore there is no advantage in making qcow2_update_cluster_refcount() return the new value. Drop it. Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Stefan Hajnoczi --- block/qcow2-refcount.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 6016211..7556384 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -631,8 +631,7 @@ fail: /* * Increases or decreases the refcount of a given cluster. * - * If the return value is non-negative, it is the new refcount of the cluster. - * If it is negative, it is -errno and indicates an error. + * On success 0 is returned; on failure -errno is returned. */ int qcow2_update_cluster_refcount(BlockDriverState *bs, int64_t cluster_index, @@ -648,7 +647,7 @@ int qcow2_update_cluster_refcount(BlockDriverState *bs, return ret; } - return qcow2_get_refcount(bs, cluster_index); + return 0; } @@ -976,13 +975,15 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, break; } if (addend != 0) { - refcount = qcow2_update_cluster_refcount(bs, + ret = qcow2_update_cluster_refcount(bs, cluster_index, addend, QCOW2_DISCARD_SNAPSHOT); - } else { - refcount = qcow2_get_refcount(bs, cluster_index); + if (ret < 0) { + goto fail; + } } + refcount = qcow2_get_refcount(bs, cluster_index); if (refcount < 0) { ret = refcount; goto fail; @@ -1017,11 +1018,15 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, if (addend != 0) { - refcount = qcow2_update_cluster_refcount(bs, l2_offset >> - s->cluster_bits, addend, QCOW2_DISCARD_SNAPSHOT); - } else { - refcount = qcow2_get_refcount(bs, l2_offset >> s->cluster_bits); + ret = qcow2_update_cluster_refcount(bs, l2_offset >> + s->cluster_bits, + addend, + QCOW2_DISCARD_SNAPSHOT); + if (ret < 0) { + goto fail; + } } + refcount = qcow2_get_refcount(bs, l2_offset >> s->cluster_bits); if (refcount < 0) { ret = refcount; goto fail; -- 1.9.3