From nobody Tue Feb 10 16:58:01 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.zohomail.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 1501863259334202.6034087974466; Fri, 4 Aug 2017 09:14:19 -0700 (PDT) Received: from localhost ([::1]:51924 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddfEv-0003Ah-P0 for importer@patchew.org; Fri, 04 Aug 2017 12:14:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54628) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddeJN-0005UI-3T for qemu-devel@nongnu.org; Fri, 04 Aug 2017 11:14:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddeJL-0007Dx-9k for qemu-devel@nongnu.org; Fri, 04 Aug 2017 11:14:48 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:45565 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ddeJK-0007BC-V9 for qemu-devel@nongnu.org; Fri, 04 Aug 2017 11:14:47 -0400 Received: from kvm.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v74FEeGG003061; Fri, 4 Aug 2017 18:14:41 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Fri, 4 Aug 2017 18:14:35 +0300 Message-Id: <20170804151440.320927-13-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170804151440.320927-1-vsementsov@virtuozzo.com> References: <20170804151440.320927-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH 12/17] block/nbd-client: refactor nbd_co_request 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: kwolf@redhat.com, vsementsov@virtuozzo.com, mreitz@redhat.com, den@openvz.org, pbonzini@redhat.com 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" Reduce nesting, get rid of extra variable. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd-client.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/block/nbd-client.c b/block/nbd-client.c index b84cab4079..d6145c7db0 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -118,7 +118,6 @@ static int nbd_co_request(BlockDriverState *bs, { NBDClientSession *s =3D nbd_get_client_session(bs); int rc, ret, i; - NBDReply reply; =20 qemu_co_mutex_lock(&s->send_mutex); while (s->in_flight =3D=3D MAX_NBD_REQUESTS) { @@ -171,20 +170,20 @@ static int nbd_co_request(BlockDriverState *bs, =20 /* Wait until we're woken up by nbd_read_reply_entry. */ qemu_coroutine_yield(); - reply =3D s->reply; - if (reply.handle !=3D request->handle || - !s->ioc) { - reply.error =3D EIO; - } else { - if (qiov && reply.error =3D=3D 0) { - ret =3D nbd_rwv(s->ioc, qiov->iov, qiov->niov, request->len, t= rue, - NULL); - if (ret !=3D request->len) { - reply.error =3D EIO; - } + if (s->reply.handle !=3D request->handle || !s->ioc) { + rc =3D -EIO; + goto out; + } + + if (qiov && s->reply.error =3D=3D 0) { + ret =3D nbd_rwv(s->ioc, qiov->iov, qiov->niov, request->len, true,= NULL); + if (ret !=3D request->len) { + rc =3D -EIO; + goto out; } } - rc =3D -reply.error; + + rc =3D -s->reply.error; =20 out: /* Tell the read handler to read another header. */ --=20 2.11.1