{"id":831186,"url":"http://patchwork.ozlabs.org/api/1.2/patches/831186/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20171027104037.8319-6-eblake@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20171027104037.8319-6-eblake@redhat.com>","list_archive_url":null,"date":"2017-10-27T10:40:30","name":"[v6,05/12] nbd/server: Simplify nbd_negotiate_options loop","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"205649bd22f8db0c20259966b72972e309b57dd5","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/1.2/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20171027104037.8319-6-eblake@redhat.com/mbox/","series":[{"id":10552,"url":"http://patchwork.ozlabs.org/api/1.2/series/10552/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=10552","date":"2017-10-27T10:40:27","name":"nbd minimal structured read","version":6,"mbox":"http://patchwork.ozlabs.org/series/10552/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/831186/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/831186/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3yNgRY5Xzyz9t2d\n\tfor ;\n\tFri, 27 Oct 2017 21:42:01 +1100 (AEDT)","from localhost ([::1]:56545 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1e825P-0001Vl-PC\n\tfor incoming@patchwork.ozlabs.org; Fri, 27 Oct 2017 06:41:59 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57251)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1e824P-0001E6-EL\n\tfor qemu-devel@nongnu.org; Fri, 27 Oct 2017 06:40:58 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1e824O-0005bZ-Li\n\tfor qemu-devel@nongnu.org; Fri, 27 Oct 2017 06:40:57 -0400","from mx1.redhat.com ([209.132.183.28]:40014)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1e824K-0005Yj-Uv; Fri, 27 Oct 2017 06:40:53 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id DF63D5D9E6;\n\tFri, 27 Oct 2017 10:40:51 +0000 (UTC)","from red.redhat.com (ovpn-120-166.rdu2.redhat.com [10.10.120.166])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 83E405C549;\n\tFri, 27 Oct 2017 10:40:50 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com DF63D5D9E6","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Fri, 27 Oct 2017 12:40:30 +0200","Message-Id":"<20171027104037.8319-6-eblake@redhat.com>","In-Reply-To":"<20171027104037.8319-1-eblake@redhat.com>","References":"<20171027104037.8319-1-eblake@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tFri, 27 Oct 2017 10:40:52 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v6 05/12] nbd/server: Simplify\n\tnbd_negotiate_options loop","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"pbonzini@redhat.com, vsementsov@virtuozzo.com, qemu-block@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Instead of making each caller check whether a transmission error\noccurred, we can sink a common error check to the end of the loop.\n\nSigned-off-by: Eric Blake \n\n---\nv6: split from length validation [Vladimir]\n---\n nbd/server.c | 18 +++---------------\n 1 file changed, 3 insertions(+), 15 deletions(-)","diff":"diff --git a/nbd/server.c b/nbd/server.c\nindex 05ff7470d5..6af708662d 100644\n--- a/nbd/server.c\n+++ b/nbd/server.c\n@@ -698,9 +698,6 @@ static int nbd_negotiate_options(NBDClient *client, uint16_t myflags,\n \"Option 0x%\" PRIx32\n \"not permitted before TLS\",\n option);\n- if (ret < 0) {\n- return ret;\n- }\n /* Let the client keep trying, unless they asked to\n * quit. In this mode, we've already sent an error, so\n * we can't ack the abort. */\n@@ -713,9 +710,6 @@ static int nbd_negotiate_options(NBDClient *client, uint16_t myflags,\n switch (option) {\n case NBD_OPT_LIST:\n ret = nbd_negotiate_handle_list(client, length, errp);\n- if (ret < 0) {\n- return ret;\n- }\n break;\n\n case NBD_OPT_ABORT:\n@@ -738,9 +732,6 @@ static int nbd_negotiate_options(NBDClient *client, uint16_t myflags,\n assert(option == NBD_OPT_GO);\n return 0;\n }\n- if (ret) {\n- return ret;\n- }\n break;\n\n case NBD_OPT_STARTTLS:\n@@ -758,9 +749,6 @@ static int nbd_negotiate_options(NBDClient *client, uint16_t myflags,\n option, errp,\n \"TLS not configured\");\n }\n- if (ret < 0) {\n- return ret;\n- }\n break;\n default:\n if (nbd_drop(client->ioc, length, errp) < 0) {\n@@ -772,9 +760,6 @@ static int nbd_negotiate_options(NBDClient *client, uint16_t myflags,\n \"Unsupported option 0x%\"\n PRIx32 \" (%s)\", option,\n nbd_opt_lookup(option));\n- if (ret < 0) {\n- return ret;\n- }\n break;\n }\n } else {\n@@ -794,6 +779,9 @@ static int nbd_negotiate_options(NBDClient *client, uint16_t myflags,\n return -EINVAL;\n }\n }\n+ if (ret < 0) {\n+ return ret;\n+ }\n }\n }\n\n","prefixes":["v6","05/12"]}