[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/12] nbd/server: get rid of EAGAIN dead code
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH v2 06/12] nbd/server: get rid of EAGAIN dead code |
Date: |
Fri, 2 Jun 2017 18:01:44 +0300 |
For now nbd_read never returns EAGAIN. So, don't handle it.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
nbd/server.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index dd6b241761..b0bb263596 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -997,11 +997,12 @@ static int nbd_co_send_reply(NBDRequestData *req,
NBDReply *reply, int len)
return rc;
}
-/* Collect a client request. Return 0 if request looks valid, -EAGAIN
- * to keep trying the collection, -EIO to drop connection right away,
- * and any other negative value to report an error to the client
- * (although the caller may still need to disconnect after reporting
- * the error). */
+/* nbd_co_receive_request
+ * Collect a client request. Return 0 if request looks valid, -EIO to drop
+ * connection right away, and any other negative value to report an error to
+ * the client (although the caller may still need to disconnect after reporting
+ * the error).
+ */
static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request)
{
NBDClient *client = req->client;
@@ -1011,9 +1012,7 @@ static int nbd_co_receive_request(NBDRequestData *req,
NBDRequest *request)
assert(client->recv_coroutine == qemu_coroutine_self());
rc = nbd_receive_request(client->ioc, request);
if (rc < 0) {
- if (rc != -EAGAIN) {
- rc = -EIO;
- }
+ rc = -EIO;
goto out;
}
@@ -1114,9 +1113,6 @@ static coroutine_fn void nbd_trip(void *opaque)
req = nbd_request_get(client);
ret = nbd_co_receive_request(req, &request);
- if (ret == -EAGAIN) {
- goto done;
- }
if (ret == -EIO) {
goto out;
}
--
2.11.1
- [Qemu-devel] [PATCH v2 00/12] nbd refactoring part 1, Vladimir Sementsov-Ogievskiy, 2017/06/02
- [Qemu-devel] [PATCH v2 07/12] nbd/server: refactor nbd_co_receive_request, Vladimir Sementsov-Ogievskiy, 2017/06/02
- [Qemu-devel] [PATCH v2 11/12] nbd/server: rename rc to ret, Vladimir Sementsov-Ogievskiy, 2017/06/02
- [Qemu-devel] [PATCH v2 12/12] nbd/server: refactor nbd_trip, Vladimir Sementsov-Ogievskiy, 2017/06/02
- [Qemu-devel] [PATCH v2 08/12] nbd/server: remove NBDClientNewData, Vladimir Sementsov-Ogievskiy, 2017/06/02
- [Qemu-devel] [PATCH v2 10/12] nbd/server: get rid of fail: return rc, Vladimir Sementsov-Ogievskiy, 2017/06/02
- [Qemu-devel] [PATCH v2 05/12] nbd/server: refactor nbd_co_send_reply, Vladimir Sementsov-Ogievskiy, 2017/06/02
- [Qemu-devel] [PATCH v2 03/12] nbd/server: get rid of nbd_negotiate_read and friends, Vladimir Sementsov-Ogievskiy, 2017/06/02
- [Qemu-devel] [PATCH v2 06/12] nbd/server: get rid of EAGAIN dead code,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH v2 09/12] nbd/server: nbd_negotiate: fix error path, Vladimir Sementsov-Ogievskiy, 2017/06/02
- [Qemu-devel] [PATCH v2 04/12] nbd/server: get rid of ssize_t, Vladimir Sementsov-Ogievskiy, 2017/06/02
- [Qemu-devel] [PATCH v2 02/12] nbd: make nbd_drop public, Vladimir Sementsov-Ogievskiy, 2017/06/02
- [Qemu-devel] [PATCH v2 01/12] nbd: rename read_sync and friends, Vladimir Sementsov-Ogievskiy, 2017/06/02
- [Qemu-devel] ping Re: [PATCH v2 00/12] nbd refactoring part 1, Vladimir Sementsov-Ogievskiy, 2017/06/13