[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/11] nbd/server: refactor nbd_negotiate
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PULL 03/11] nbd/server: refactor nbd_negotiate |
Date: |
Mon, 10 Jul 2017 07:14:26 -0500 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Combine two successive "if (oldStyle) {...} else {...}" into one.
Block "if (client->tlscreds)" under "if (oldStyle)" is unreachable,
as we have "oldStyle = client->exp != NULL && !client->tlscreds;".
So, delete this block.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
---
nbd/server.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index 3963972..a6a57ce 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -584,21 +584,15 @@ static coroutine_fn int nbd_negotiate(NBDClient *client)
stq_be_p(buf + 8, NBD_CLIENT_MAGIC);
stq_be_p(buf + 16, client->exp->size);
stw_be_p(buf + 26, client->exp->nbdflags | myflags);
+
+ if (nbd_write(client->ioc, buf, sizeof(buf), NULL) < 0) {
+ LOG("write failed");
+ return -EINVAL;
+ }
} else {
stq_be_p(buf + 8, NBD_OPTS_MAGIC);
stw_be_p(buf + 16, NBD_FLAG_FIXED_NEWSTYLE | NBD_FLAG_NO_ZEROES);
- }
- if (oldStyle) {
- if (client->tlscreds) {
- TRACE("TLS cannot be enabled with oldstyle protocol");
- return -EINVAL;
- }
- if (nbd_write(client->ioc, buf, sizeof(buf), NULL) < 0) {
- LOG("write failed");
- return -EINVAL;
- }
- } else {
if (nbd_write(client->ioc, buf, 18, NULL) < 0) {
LOG("write failed");
return -EINVAL;
--
2.9.4
- [Qemu-devel] [PULL 00/11] NBD patches, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 01/11] MAINTAINERS: Promote NBD to supported, with new maintainer, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 02/11] nbd/server: nbd_negotiate: return 1 on NBD_OPT_ABORT, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 05/11] nbd/server: add errp to nbd_send_reply(), Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 07/11] nbd/client: refactor TRACE of NBD_MAGIC, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 03/11] nbd/server: refactor nbd_negotiate,
Eric Blake <=
- [Qemu-devel] [PULL 06/11] nbd/common: nbd_tls_handshake: remove extra TRACE, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 08/11] nbd/server: fix TRACE in nbd_negotiate_send_rep_len, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 09/11] nbd/server: rename clientflags var in nbd_negotiate_options, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 10/11] nbd: refactor tracing, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 04/11] nbd/server: use errp instead of LOG, Eric Blake, 2017/07/10
- [Qemu-devel] [PULL 11/11] nbd: use generic trace subsystem instead of TRACE macro, Eric Blake, 2017/07/10
- Re: [Qemu-devel] [PULL 00/11] NBD patches, Peter Maydell, 2017/07/10