From nobody Thu Nov 6 08:36:11 2025 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; dkim=fail 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 149752530745912.298591269436088; Thu, 15 Jun 2017 04:15:07 -0700 (PDT) Received: from localhost ([::1]:53230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLSjy-000466-7i for importer@patchew.org; Thu, 15 Jun 2017 07:15:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLSPP-0000D4-MZ for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLSPM-0007ht-Ll for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:51 -0400 Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]:35424) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLSPM-0007hR-GG for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:48 -0400 Received: by mail-wr0-x22f.google.com with SMTP id q97so16333517wrb.2 for ; Thu, 15 Jun 2017 03:53:48 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id f21sm3258597wra.5.2017.06.15.03.53.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 03:53:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=FG/6MVyrR6Hla7wA5V61X7BC27kCKOeFy18JRn9s9rA=; b=FvIn159gDxkCGLVw5hH3UYcr2cQ7EICBTMTtqj/tKQ+xWfauoARgIyOcgu351uv3qm 428GIm5wWiIEDQWEv8Wv6YB7SKb0A4o+J+c7itr/9YIepTnGqclgwz5Gol/z7nBs2I+3 J7Qhfmfn8MB2puc6No/4Je0nwbTNL+OIU9D2LvgLlalMemcLjB8of+XFNfY+vi7DJv94 wkdUzRdqoHFJ2ROutv1/Z1wDfM03VZNlmHChKi70k0E1JMBL7zplCDhVrClZ/rWSnFz0 MKYBAHs5CDrOXPZPGL2s4Rqd9X15yu44TwbeTHzdwUQxaNczo3Hyf0j/ZLLfzy382z2r Ixqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=FG/6MVyrR6Hla7wA5V61X7BC27kCKOeFy18JRn9s9rA=; b=pKaIySLf65P1gvef4uBReCbmj38N0SLm5+vRsrnOeMhHqfbYU3IyYYZxqvFt5ViV9e 8q6KI8XqnOCmLl5wIcxrl9xXue6oyOzHmgrP8cOSbpHok9UylN/2iWgSyPoTfoR3Z4LK 7Q4EzyoukTseM42iEOTGLxpiUmt/oHtoh9VKUBiLqtdVQIv8MygcsXSTXjyp8JilYTHW 4C/yOJdOh6oUAf4b1fg70cgCQrle8EzdlRXzrWrck8JB+AowpRTlJCSBP84lRF+qlY9S EHjXxGkdRRhAy5pKmHLESiFiySrJjP5WSk8hBkTAbNpkHc1ToaULnaBVlH9kBPCkMCfp OEcw== X-Gm-Message-State: AKS2vOwYxucshrWdBEO+qF1sQ79NRkvWr1e7I+guPB7o6Z2WDS00NPO1 luIPd13qVt5BKWejHxQ= X-Received: by 10.223.180.65 with SMTP id v1mr3062153wrd.126.1497524027128; Thu, 15 Jun 2017 03:53:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 15 Jun 2017 12:52:53 +0200 Message-Id: <1497523981-38449-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1497523981-38449-1-git-send-email-pbonzini@redhat.com> References: <1497523981-38449-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22f Subject: [Qemu-devel] [PULL 33/41] nbd/server: get rid of fail: return rc 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: Vladimir Sementsov-Ogievskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy "goto fail" error handling scheme is not needed for just returning error code. Better is return it immediately. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake Message-Id: <20170602150150.258222-11-vsementsov@virtuozzo.com> Signed-off-by: Paolo Bonzini --- nbd/server.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/nbd/server.c b/nbd/server.c index c9ca847..3b46038 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -265,7 +265,6 @@ static int nbd_negotiate_handle_list(NBDClient *client,= uint32_t length) =20 static int nbd_negotiate_handle_export_name(NBDClient *client, uint32_t le= ngth) { - int rc =3D -EINVAL; char name[NBD_MAX_NAME_SIZE + 1]; =20 /* Client sends: @@ -274,11 +273,11 @@ static int nbd_negotiate_handle_export_name(NBDClient= *client, uint32_t length) TRACE("Checking length"); if (length >=3D sizeof(name)) { LOG("Bad length received"); - goto fail; + return -EINVAL; } if (nbd_read(client->ioc, name, length, NULL) < 0) { LOG("read failed"); - goto fail; + return -EINVAL; } name[length] =3D '\0'; =20 @@ -287,14 +286,13 @@ static int nbd_negotiate_handle_export_name(NBDClient= *client, uint32_t length) client->exp =3D nbd_export_find(name); if (!client->exp) { LOG("export not found"); - goto fail; + return -EINVAL; } =20 QTAILQ_INSERT_TAIL(&client->exp->clients, client, next); nbd_export_get(client->exp); - rc =3D 0; -fail: - return rc; + + return 0; } =20 /* Handle NBD_OPT_STARTTLS. Return NULL to drop connection, or else the @@ -564,7 +562,6 @@ static coroutine_fn int nbd_negotiate(NBDClient *client) */ =20 qio_channel_set_blocking(client->ioc, false, NULL); - rc =3D -EINVAL; =20 TRACE("Beginning negotiation."); memset(buf, 0, sizeof(buf)); @@ -585,21 +582,21 @@ static coroutine_fn int nbd_negotiate(NBDClient *clie= nt) if (oldStyle) { if (client->tlscreds) { TRACE("TLS cannot be enabled with oldstyle protocol"); - goto fail; + return -EINVAL; } if (nbd_write(client->ioc, buf, sizeof(buf), NULL) < 0) { LOG("write failed"); - goto fail; + return -EINVAL; } } else { if (nbd_write(client->ioc, buf, 18, NULL) < 0) { LOG("write failed"); - goto fail; + return -EINVAL; } rc =3D nbd_negotiate_options(client); if (rc !=3D 0) { LOG("option negotiation failed"); - goto fail; + return rc; } =20 TRACE("advertising size %" PRIu64 " and flags %x", @@ -610,14 +607,13 @@ static coroutine_fn int nbd_negotiate(NBDClient *clie= nt) rc =3D nbd_write(client->ioc, buf + 18, len, NULL); if (rc < 0) { LOG("write failed"); - goto fail; + return rc; } } =20 TRACE("Negotiation succeeded."); - rc =3D 0; -fail: - return rc; + + return 0; } =20 static int nbd_receive_request(QIOChannel *ioc, NBDRequest *request) --=20 1.8.3.1