diff options
| author | Vladimir Sementsov-Ogievskiy | 2017-07-07 17:29:10 +0200 |
|---|---|---|
| committer | Eric Blake | 2017-07-10 16:57:24 +0200 |
| commit | 76ff081d91d215a4f91849653bdc2ebd8f657183 (patch) | |
| tree | 670d672353b63c12dbc8f9c9fbe102deca135e50 /nbd | |
| parent | nbd/server: nbd_negotiate: return 1 on NBD_OPT_ABORT (diff) | |
| download | qemu-76ff081d91d215a4f91849653bdc2ebd8f657183.tar.gz qemu-76ff081d91d215a4f91849653bdc2ebd8f657183.tar.xz qemu-76ff081d91d215a4f91849653bdc2ebd8f657183.zip | |
nbd/server: refactor nbd_negotiate
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 <vsementsov@virtuozzo.com>
Message-Id: <20170707152918.23086-3-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'nbd')
| -rw-r--r-- | nbd/server.c | 12 |
1 files 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; |