[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 30/41] nbd/server: refactor nbd_co_receive_request
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 30/41] nbd/server: refactor nbd_co_receive_request |
Date: |
Thu, 15 Jun 2017 12:52:50 +0200 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Move function tail, about receiving next request out of the function.
Error path is simplified and nbd_co_receive_request becomes more
corresponding to its name.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
nbd/server.c | 41 +++++++++++++----------------------------
1 file changed, 13 insertions(+), 28 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index 00a19f6..9fb03ce 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -1006,14 +1006,11 @@ static int nbd_co_send_reply(NBDRequestData *req,
NBDReply *reply, int len)
static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request)
{
NBDClient *client = req->client;
- int rc;
g_assert(qemu_in_coroutine());
assert(client->recv_coroutine == qemu_coroutine_self());
- rc = nbd_receive_request(client->ioc, request);
- if (rc < 0) {
- rc = -EIO;
- goto out;
+ if (nbd_receive_request(client->ioc, request) < 0) {
+ return -EIO;
}
TRACE("Decoding type");
@@ -1027,8 +1024,7 @@ static int nbd_co_receive_request(NBDRequestData *req,
NBDRequest *request)
/* Special case: we're going to disconnect without a reply,
* whether or not flags, from, or len are bogus */
TRACE("Request type is DISCONNECT");
- rc = -EIO;
- goto out;
+ return -EIO;
}
/* Check for sanity in the parameters, part 1. Defer as many
@@ -1036,22 +1032,19 @@ static int nbd_co_receive_request(NBDRequestData *req,
NBDRequest *request)
* payload, so we can try and keep the connection alive. */
if ((request->from + request->len) < request->from) {
LOG("integer overflow detected, you're probably being attacked");
- rc = -EINVAL;
- goto out;
+ return -EINVAL;
}
if (request->type == NBD_CMD_READ || request->type == NBD_CMD_WRITE) {
if (request->len > NBD_MAX_BUFFER_SIZE) {
LOG("len (%" PRIu32" ) is larger than max len (%u)",
request->len, NBD_MAX_BUFFER_SIZE);
- rc = -EINVAL;
- goto out;
+ return -EINVAL;
}
req->data = blk_try_blockalign(client->exp->blk, request->len);
if (req->data == NULL) {
- rc = -ENOMEM;
- goto out;
+ return -ENOMEM;
}
}
if (request->type == NBD_CMD_WRITE) {
@@ -1059,8 +1052,7 @@ static int nbd_co_receive_request(NBDRequestData *req,
NBDRequest *request)
if (nbd_read(client->ioc, req->data, request->len, NULL) < 0) {
LOG("reading from socket failed");
- rc = -EIO;
- goto out;
+ return -EIO;
}
req->complete = true;
}
@@ -1070,28 +1062,19 @@ static int nbd_co_receive_request(NBDRequestData *req,
NBDRequest *request)
LOG("operation past EOF; From: %" PRIu64 ", Len: %" PRIu32
", Size: %" PRIu64, request->from, request->len,
(uint64_t)client->exp->size);
- rc = request->type == NBD_CMD_WRITE ? -ENOSPC : -EINVAL;
- goto out;
+ return request->type == NBD_CMD_WRITE ? -ENOSPC : -EINVAL;
}
if (request->flags & ~(NBD_CMD_FLAG_FUA | NBD_CMD_FLAG_NO_HOLE)) {
LOG("unsupported flags (got 0x%x)", request->flags);
- rc = -EINVAL;
- goto out;
+ return -EINVAL;
}
if (request->type != NBD_CMD_WRITE_ZEROES &&
(request->flags & NBD_CMD_FLAG_NO_HOLE)) {
LOG("unexpected flags (got 0x%x)", request->flags);
- rc = -EINVAL;
- goto out;
+ return -EINVAL;
}
- rc = 0;
-
-out:
- client->recv_coroutine = NULL;
- nbd_client_receive_next_request(client);
-
- return rc;
+ return 0;
}
/* Owns a reference to the NBDClient passed as opaque. */
@@ -1113,6 +1096,8 @@ static coroutine_fn void nbd_trip(void *opaque)
req = nbd_request_get(client);
ret = nbd_co_receive_request(req, &request);
+ client->recv_coroutine = NULL;
+ nbd_client_receive_next_request(client);
if (ret == -EIO) {
goto out;
}
--
1.8.3.1
- [Qemu-devel] [PULL 27/41] nbd/server: get rid of ssize_t, (continued)
- [Qemu-devel] [PULL 27/41] nbd/server: get rid of ssize_t, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 19/41] qemu-nbd: Ignore SIGPIPE, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 29/41] nbd/server: get rid of EAGAIN dead code, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 35/41] nbd/server: refactor nbd_trip, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 10/41] megasas: do not read DCMD opcode more than once from frame, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 11/41] megasas: do not read command more than once from frame, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 05/41] ivshmem: use ram_from_fd(), Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 18/41] nbd: Fix regression on resiliency to port scan, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 07/41] megasas: add qtest, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 24/41] nbd: rename read_sync and friends, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 30/41] nbd/server: refactor nbd_co_receive_request,
Paolo Bonzini <=
- [Qemu-devel] [PULL 34/41] nbd/server: rename rc to ret, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 31/41] nbd/server: remove NBDClientNewData, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 32/41] nbd/server: nbd_negotiate: fix error path, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 36/41] include/exec/poison: Add missing TARGET defines, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 33/41] nbd/server: get rid of fail: return rc, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 37/41] include/exec/poison: Mark some CONFIG defines as poisoned, too, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 38/41] docs: create interop/ subdirectory, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 39/41] qemu-doc: include version number, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 40/41] vhost-user-scsi: Introduce vhost-user-scsi host device, Paolo Bonzini, 2017/06/15
- [Qemu-devel] [PULL 41/41] vhost-user-scsi: Introduce a vhost-user-scsi sample application, Paolo Bonzini, 2017/06/15