From ed2dd91267a813e4ac5619a2fb53f55c005fcfa6 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 14 Oct 2016 13:33:07 -0500 Subject: nbd: Rename struct nbd_request and nbd_reply Our coding convention prefers CamelCase names, and we already have other existing structs with NBDFoo naming. Let's be consistent, before later patches add even more structs. Signed-off-by: Eric Blake Message-Id: <1476469998-28592-6-git-send-email-eblake@redhat.com> Signed-off-by: Paolo Bonzini --- nbd/client.c | 4 ++-- nbd/server.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'nbd') diff --git a/nbd/client.c b/nbd/client.c index 4620e8d..fe24d31 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -708,7 +708,7 @@ int nbd_disconnect(int fd) } #endif -ssize_t nbd_send_request(QIOChannel *ioc, struct nbd_request *request) +ssize_t nbd_send_request(QIOChannel *ioc, NBDRequest *request) { uint8_t buf[NBD_REQUEST_SIZE]; ssize_t ret; @@ -738,7 +738,7 @@ ssize_t nbd_send_request(QIOChannel *ioc, struct nbd_request *request) return 0; } -ssize_t nbd_receive_reply(QIOChannel *ioc, struct nbd_reply *reply) +ssize_t nbd_receive_reply(QIOChannel *ioc, NBDReply *reply) { uint8_t buf[NBD_REPLY_SIZE]; uint32_t magic; diff --git a/nbd/server.c b/nbd/server.c index 09d949f..badc2d1 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -635,7 +635,7 @@ fail: return rc; } -static ssize_t nbd_receive_request(QIOChannel *ioc, struct nbd_request *request) +static ssize_t nbd_receive_request(QIOChannel *ioc, NBDRequest *request) { uint8_t buf[NBD_REQUEST_SIZE]; uint32_t magic; @@ -678,7 +678,7 @@ static ssize_t nbd_receive_request(QIOChannel *ioc, struct nbd_request *request) return 0; } -static ssize_t nbd_send_reply(QIOChannel *ioc, struct nbd_reply *reply) +static ssize_t nbd_send_reply(QIOChannel *ioc, NBDReply *reply) { uint8_t buf[NBD_REPLY_SIZE]; ssize_t ret; @@ -976,7 +976,7 @@ void nbd_export_close_all(void) } } -static ssize_t nbd_co_send_reply(NBDRequestData *req, struct nbd_reply *reply, +static ssize_t nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len) { NBDClient *client = req->client; @@ -1013,7 +1013,7 @@ static ssize_t nbd_co_send_reply(NBDRequestData *req, struct nbd_reply *reply, * (although the caller may still need to disconnect after reporting * the error). */ static ssize_t nbd_co_receive_request(NBDRequestData *req, - struct nbd_request *request) + NBDRequest *request) { NBDClient *client = req->client; ssize_t rc; @@ -1107,8 +1107,8 @@ static void nbd_trip(void *opaque) NBDClient *client = opaque; NBDExport *exp = client->exp; NBDRequestData *req; - struct nbd_request request; - struct nbd_reply reply; + NBDRequest request; + NBDReply reply; ssize_t ret; int flags; -- cgit v1.1