[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/19] nbd/server: refactor nbd_co_send_reply
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH 03/19] nbd/server: refactor nbd_co_send_reply |
Date: |
Tue, 30 May 2017 17:30:36 +0300 |
As write_sync never returns value > 0, we can get rid of extra ret.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
nbd/server.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index 03880fd501..e18eb020a7 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -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 = write_sync(client->ioc, req->data, len, NULL);
- if (ret < 0) {
+ if (rc == 0) {
+ rc = write_sync(client->ioc, req->data, len, NULL);
+ if (rc < 0) {
rc = -EIO;
}
}
--
2.11.1
- [Qemu-devel] [PATCH 06/19] nbd/server: remove NBDClientNewData, (continued)
[Qemu-devel] [PATCH 15/19] nbd/server: use errp instead of LOG, Vladimir Sementsov-Ogievskiy, 2017/05/30
[Qemu-devel] [PATCH 16/19] nbd/server: add errp to nbd_send_reply(), Vladimir Sementsov-Ogievskiy, 2017/05/30
[Qemu-devel] [PATCH 03/19] nbd/server: refactor nbd_co_send_reply,
Vladimir Sementsov-Ogievskiy <=
[Qemu-devel] [PATCH 04/19] nbd/server: get rid of EAGAIN dead code, Vladimir Sementsov-Ogievskiy, 2017/05/30
[Qemu-devel] [PATCH 19/19] nbd: use generic trace subsystem instead of TRACE macro, Vladimir Sementsov-Ogievskiy, 2017/05/30