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 1497524858742155.5728622541301; Thu, 15 Jun 2017 04:07:38 -0700 (PDT) Received: from localhost ([::1]:53189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLScj-0004Y2-7l for importer@patchew.org; Thu, 15 Jun 2017 07:07:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLSPH-0008U7-JF for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLSPG-0007eM-Q1 for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:43 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:34390) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLSPG-0007dz-Jn for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:42 -0400 Received: by mail-wr0-x243.google.com with SMTP id y25so547693wrd.1 for ; Thu, 15 Jun 2017 03:53:42 -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.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 03:53:40 -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=4TrFM/XcA/uPUkqybmB7x0EP+vDWzW8hKAad0a5HQn8=; b=JrXBOFV+n+isUxFXnO0O8K8qi1tyVfore1wsv6nxkrGPg+PUAf9qhMKRQij9xxrwlJ 0ApSUhu5ZAxwflBTBHmd56VTMljLrFBE6v269dJ9HAWSEa4Kfe03oAKNaihBdbzBVn9Y 2Wwi2zPcLtbBQUA06JX4b1nwAkRS31bCf16S5T++Z362Oy4OA7ZNripVA8qk5A3x83Ux u8kJpdKtKXxTykYgxuPIRE6AseiCUCw1vaWv3CONmyPQNE5Ezrxj+UbTUR2N8C4GdT3+ g5TJ+r/8SRWxsAWi13P7vBMc4C3UVnzwGtcnhHp81KFGfRgUmFRje6wLf/Ygec28VHdR MjNA== 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=4TrFM/XcA/uPUkqybmB7x0EP+vDWzW8hKAad0a5HQn8=; b=kWTWE/BMFkSpvNC/C+6P6dDAQkpGg9jL7pBcQc5xbcyWVtqPVm5olcnfnqpRoc6h1o uKFsId357pMQ67xkAaCL8Fzt+P7tl5vHWckX2IEORW952/Ldi7XyHLIL1KLj0ZdVT4eI gV8cKzuEfOAeV66FA/n0QnJz7VKS4adiCJ7AJnhZtvMRBZoF327XsKsLf8BJC86vB4pu RoNvykj6pMAuFn7wtWWpAhQMkNBFVVv8/OV5r+NJq7p/ZEfJWd5L7mQQ8o2b0EfmpM9J AreUzZiDHn3b9VcHRLGU/lDNxjJwm/gdceBpH+ygK0MdoJqKUJraMntTUWrp+WVe1XWd Ipyg== X-Gm-Message-State: AKS2vOwkq83/9Og07fxcF25tswda5nf4ZGz3PVUnSUi1AocfjlGIK/l1 0Er1mb6JCI/g4mgAfdI= X-Received: by 10.28.54.13 with SMTP id d13mr3177839wma.124.1497524021432; Thu, 15 Jun 2017 03:53:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 15 Jun 2017 12:52:48 +0200 Message-Id: <1497523981-38449-29-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::243 Subject: [Qemu-devel] [PULL 28/41] nbd/server: refactor nbd_co_send_reply 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 As nbd_write never returns value > 0, we can get rid of extra ret. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake Message-Id: <20170602150150.258222-6-vsementsov@virtuozzo.com> Signed-off-by: Paolo Bonzini --- nbd/server.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nbd/server.c b/nbd/server.c index 895cd7f..8ceac89 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -972,7 +972,7 @@ void nbd_export_close_all(void) static int nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len) { NBDClient *client =3D req->client; - int rc, ret; + int rc; =20 g_assert(qemu_in_coroutine()); qemu_co_mutex_lock(&client->send_lock); @@ -983,9 +983,9 @@ static int nbd_co_send_reply(NBDRequestData *req, NBDRe= ply *reply, int len) } else { qio_channel_set_cork(client->ioc, true); rc =3D nbd_send_reply(client->ioc, reply); - if (rc >=3D 0) { - ret =3D nbd_write(client->ioc, req->data, len, NULL); - if (ret < 0) { + if (rc =3D=3D 0) { + rc =3D nbd_write(client->ioc, req->data, len, NULL); + if (rc < 0) { rc =3D -EIO; } } --=20 1.8.3.1