[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 02/10] nbd/server: refactor nbd_negotiate
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH v3 02/10] nbd/server: refactor nbd_negotiate |
Date: |
Fri, 7 Jul 2017 18:29:10 +0300 |
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>
---
nbd/server.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index 3963972337..a6a57ce7c1 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);
- } 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 {
+ stq_be_p(buf + 8, NBD_OPTS_MAGIC);
+ stw_be_p(buf + 16, NBD_FLAG_FIXED_NEWSTYLE | NBD_FLAG_NO_ZEROES);
+
if (nbd_write(client->ioc, buf, 18, NULL) < 0) {
LOG("write failed");
return -EINVAL;
--
2.11.1
- [Qemu-devel] [PATCH v3 00/10] nbd refactoring part 2, Vladimir Sementsov-Ogievskiy, 2017/07/07
- [Qemu-devel] [PATCH v3 09/10] nbd: refactor tracing, Vladimir Sementsov-Ogievskiy, 2017/07/07
- [Qemu-devel] [PATCH v3 05/10] nbd/common: nbd_tls_handshake: remove extra TRACE, Vladimir Sementsov-Ogievskiy, 2017/07/07
- [Qemu-devel] [PATCH v3 02/10] nbd/server: refactor nbd_negotiate,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH v3 01/10] nbd/server: nbd_negotiate: return 1 on NBD_OPT_ABORT, Vladimir Sementsov-Ogievskiy, 2017/07/07
- [Qemu-devel] [PATCH v3 07/10] nbd/server: fix TRACE in nbd_negotiate_send_rep_len, Vladimir Sementsov-Ogievskiy, 2017/07/07
- [Qemu-devel] [PATCH v3 08/10] nbd/server: rename clientflags var in nbd_negotiate_options, Vladimir Sementsov-Ogievskiy, 2017/07/07
- [Qemu-devel] [PATCH v3 06/10] nbd/client: refactor TRACE of NBD_MAGIC, Vladimir Sementsov-Ogievskiy, 2017/07/07
- [Qemu-devel] [PATCH v3 04/10] nbd/server: add errp to nbd_send_reply(), Vladimir Sementsov-Ogievskiy, 2017/07/07
- [Qemu-devel] [PATCH v3 10/10] nbd: use generic trace subsystem instead of TRACE macro, Vladimir Sementsov-Ogievskiy, 2017/07/07