提交 572b97e7 编写于 作者: V Vladimir Sementsov-Ogievskiy 提交者: Paolo Bonzini

nbd/server: refactor nbd_co_send_reply

As nbd_write never returns value > 0, we can get rid of extra ret.
Signed-off-by: NVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
Message-Id: <20170602150150.258222-6-vsementsov@virtuozzo.com>
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
上级 a0dc63a6
......@@ -972,7 +972,7 @@ void nbd_export_close_all(void)
static int nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len)
{
NBDClient *client = req->client;
int rc, ret;
int rc;
g_assert(qemu_in_coroutine());
qemu_co_mutex_lock(&client->send_lock);
......@@ -983,9 +983,9 @@ static int nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len)
} else {
qio_channel_set_cork(client->ioc, true);
rc = nbd_send_reply(client->ioc, reply);
if (rc >= 0) {
ret = nbd_write(client->ioc, req->data, len, NULL);
if (ret < 0) {
if (rc == 0) {
rc = nbd_write(client->ioc, req->data, len, NULL);
if (rc < 0) {
rc = -EIO;
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册