From nobody Tue Feb 10 12:57:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495818583136891.1173644034805; Fri, 26 May 2017 10:09:43 -0700 (PDT) Received: from localhost ([::1]:37677 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEIk9-0006sW-L0 for importer@patchew.org; Fri, 26 May 2017 13:09:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEIXF-0000FT-2S for qemu-devel@nongnu.org; Fri, 26 May 2017 12:56:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dEIXE-0003o6-6v for qemu-devel@nongnu.org; Fri, 26 May 2017 12:56:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52360) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dEIX9-0003lY-Kr; Fri, 26 May 2017 12:56:15 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 86FAC654A; Fri, 26 May 2017 16:56:14 +0000 (UTC) Received: from localhost (unknown [10.40.205.98]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 14BF81711A; Fri, 26 May 2017 16:56:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 86FAC654A Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=mreitz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 86FAC654A From: Max Reitz To: qemu-block@nongnu.org Date: Fri, 26 May 2017 18:55:15 +0200 Message-Id: <20170526165518.7580-14-mreitz@redhat.com> In-Reply-To: <20170526165518.7580-1-mreitz@redhat.com> References: <20170526165518.7580-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 26 May 2017 16:56:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 13/16] block/qcow2: Rename "fail_block" to just "fail" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Now alloc_refcount_block() only contains a single fail label, so it makes more sense to just name it "fail" instead of "fail_block". Signed-off-by: Max Reitz Reviewed-by: Stefan Hajnoczi --- block/qcow2-refcount.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 0872c25..9d109e9 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -381,7 +381,7 @@ static int alloc_refcount_block(BlockDriverState *bs, ret =3D qcow2_cache_get_empty(bs, s->refcount_block_cache, new_blo= ck, refcount_block); if (ret < 0) { - goto fail_block; + goto fail; } =20 memset(*refcount_block, 0, s->cluster_size); @@ -396,12 +396,12 @@ static int alloc_refcount_block(BlockDriverState *bs, ret =3D update_refcount(bs, new_block, s->cluster_size, 1, false, QCOW2_DISCARD_NEVER); if (ret < 0) { - goto fail_block; + goto fail; } =20 ret =3D qcow2_cache_flush(bs, s->refcount_block_cache); if (ret < 0) { - goto fail_block; + goto fail; } =20 /* Initialize the new refcount block only after updating its refco= unt, @@ -409,7 +409,7 @@ static int alloc_refcount_block(BlockDriverState *bs, ret =3D qcow2_cache_get_empty(bs, s->refcount_block_cache, new_blo= ck, refcount_block); if (ret < 0) { - goto fail_block; + goto fail; } =20 memset(*refcount_block, 0, s->cluster_size); @@ -420,7 +420,7 @@ static int alloc_refcount_block(BlockDriverState *bs, qcow2_cache_entry_mark_dirty(bs, s->refcount_block_cache, *refcount_bl= ock); ret =3D qcow2_cache_flush(bs, s->refcount_block_cache); if (ret < 0) { - goto fail_block; + goto fail; } =20 /* If the refcount table is big enough, just hook the block up there */ @@ -431,7 +431,7 @@ static int alloc_refcount_block(BlockDriverState *bs, s->refcount_table_offset + refcount_table_index * sizeof(uint6= 4_t), &data64, sizeof(data64)); if (ret < 0) { - goto fail_block; + goto fail; } =20 s->refcount_table[refcount_table_index] =3D new_block; @@ -495,7 +495,7 @@ static int alloc_refcount_block(BlockDriverState *bs, * allocated metadata. Make the caller search some new space. */ return -EAGAIN; =20 -fail_block: +fail: if (*refcount_block !=3D NULL) { qcow2_cache_put(bs, s->refcount_block_cache, refcount_block); } --=20 2.9.4