[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/12] nbd/server: refactor nbd_co_send_reply
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH 05/12] nbd/server: refactor nbd_co_send_reply |
Date: |
Wed, 31 May 2017 19:55:34 +0300 |
As nbd_write never returns value > 0, we can get rid of extra ret.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
nbd/server.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index 8985df86b4..dd6b241761 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 = 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;
}
}
--
2.11.1
- [Qemu-devel] [PATCH 00/12] nbd refactoring part 1, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 07/12] nbd/server: refactor nbd_co_receive_request, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 06/12] nbd/server: get rid of EAGAIN dead code, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 05/12] nbd/server: refactor nbd_co_send_reply,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH 09/12] nbd/server: nbd_negotiate: fix error path, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 04/12] nbd/server: get rid of ssize_t, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 02/12] nbd: make nbd_drop public, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 11/12] nbd/server: rename rc to ret, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 12/12] nbd/server: refactor nbd_trip, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 03/12] nbd/server: get rid of nbd_negotiate_read and friends, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 10/12] nbd/server: get rid of fail: return rc, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [Qemu-devel] [PATCH 08/12] nbd/server: remove NBDClientNewData, Vladimir Sementsov-Ogievskiy, 2017/05/31