[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 03/16] nbd: Rename NBDRequest to NBDRequestData
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v7 03/16] nbd: Rename NBDRequest to NBDRequestData |
Date: |
Fri, 14 Oct 2016 13:33:05 -0500 |
We have both 'struct NBDRequest' and 'struct nbd_request'; making
it confusing to see which does what. Furthermore, we want to
rename nbd_request to align with our normal CamelCase naming
conventions. So, rename the struct which is used to associate
the data received during request callbacks, while leaving the
shorter name for the description of the request sent over the
wire in the NBD protocol.
Signed-off-by: Eric Blake <address@hidden>
---
v6: new patch
---
nbd/server.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index 2e84d51..78c0419 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -47,10 +47,10 @@ static int system_errno_to_nbd_errno(int err)
/* Definitions for opaque data types */
-typedef struct NBDRequest NBDRequest;
+typedef struct NBDRequestData NBDRequestData;
-struct NBDRequest {
- QSIMPLEQ_ENTRY(NBDRequest) entry;
+struct NBDRequestData {
+ QSIMPLEQ_ENTRY(NBDRequestData) entry;
NBDClient *client;
uint8_t *data;
bool complete;
@@ -759,21 +759,21 @@ static void client_close(NBDClient *client)
}
}
-static NBDRequest *nbd_request_get(NBDClient *client)
+static NBDRequestData *nbd_request_get(NBDClient *client)
{
- NBDRequest *req;
+ NBDRequestData *req;
assert(client->nb_requests <= MAX_NBD_REQUESTS - 1);
client->nb_requests++;
nbd_update_can_read(client);
- req = g_new0(NBDRequest, 1);
+ req = g_new0(NBDRequestData, 1);
nbd_client_get(client);
req->client = client;
return req;
}
-static void nbd_request_put(NBDRequest *req)
+static void nbd_request_put(NBDRequestData *req)
{
NBDClient *client = req->client;
@@ -975,7 +975,7 @@ void nbd_export_close_all(void)
}
}
-static ssize_t nbd_co_send_reply(NBDRequest *req, struct nbd_reply *reply,
+static ssize_t nbd_co_send_reply(NBDRequestData *req, struct nbd_reply *reply,
int len)
{
NBDClient *client = req->client;
@@ -1011,7 +1011,7 @@ static ssize_t nbd_co_send_reply(NBDRequest *req, struct
nbd_reply *reply,
* 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 ssize_t nbd_co_receive_request(NBDRequest *req,
+static ssize_t nbd_co_receive_request(NBDRequestData *req,
struct nbd_request *request)
{
NBDClient *client = req->client;
@@ -1105,7 +1105,7 @@ static void nbd_trip(void *opaque)
{
NBDClient *client = opaque;
NBDExport *exp = client->exp;
- NBDRequest *req;
+ NBDRequestData *req;
struct nbd_request request;
struct nbd_reply reply;
ssize_t ret;
--
2.7.4
- [Qemu-devel] [PATCH v7 00/16] nbd: efficient write zeroes, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 03/16] nbd: Rename NBDRequest to NBDRequestData,
Eric Blake <=
- [Qemu-devel] [PATCH v7 01/16] nbd: Add qemu-nbd -D for human-readable description, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 04/16] nbd: Rename NbdClientSession to NBDClientSession, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 06/16] nbd: Share common reply-sending code in server, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 05/16] nbd: Rename struct nbd_request and nbd_reply, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 10/16] nbd: Let client skip portions of server reply, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 02/16] nbd: Treat flags vs. command type as separate fields, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 07/16] nbd: Send message along with server NBD_REP_ERR errors, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 09/16] nbd: Let server know when client gives up negotiation, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 14/16] nbd: Improve server handling of shutdown requests, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 15/16] nbd: Implement NBD_CMD_WRITE_ZEROES on server, Eric Blake, 2016/10/14