[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/12] nbd/server: remove NBDClientNewData
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH 08/12] nbd/server: remove NBDClientNewData |
Date: |
Wed, 31 May 2017 19:55:37 +0300 |
"co" field of NBDClientNewData has never been used, all the way back to
its declaration in commit 1a6245a5. So let's just use client pointer
instead of extra structure.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
nbd/server.c | 25 +++++++------------------
1 file changed, 7 insertions(+), 18 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index 8ac095d6bc..d376563527 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -535,14 +535,8 @@ static int nbd_negotiate_options(NBDClient *client)
}
}
-typedef struct {
- NBDClient *client;
- Coroutine *co;
-} NBDClientNewData;
-
-static coroutine_fn int nbd_negotiate(NBDClientNewData *data)
+static coroutine_fn int nbd_negotiate(NBDClient *client)
{
- NBDClient *client = data->client;
char buf[8 + 8 + 8 + 128];
int rc;
const uint16_t myflags = (NBD_FLAG_HAS_FLAGS | NBD_FLAG_SEND_TRIM |
@@ -1268,16 +1262,15 @@ static void nbd_client_receive_next_request(NBDClient
*client)
static coroutine_fn void nbd_co_client_start(void *opaque)
{
- NBDClientNewData *data = opaque;
- NBDClient *client = data->client;
+ NBDClient *client = opaque;
NBDExport *exp = client->exp;
if (exp) {
nbd_export_get(exp);
}
- if (nbd_negotiate(data)) {
+ if (nbd_negotiate(client)) {
client_close(client);
- goto out;
+ return;
}
qemu_co_mutex_init(&client->send_lock);
@@ -1286,9 +1279,6 @@ static coroutine_fn void nbd_co_client_start(void *opaque)
}
nbd_client_receive_next_request(client);
-
-out:
- g_free(data);
}
void nbd_client_new(NBDExport *exp,
@@ -1298,7 +1288,7 @@ void nbd_client_new(NBDExport *exp,
void (*close_fn)(NBDClient *))
{
NBDClient *client;
- NBDClientNewData *data = g_new(NBDClientNewData, 1);
+ Coroutine *co;
client = g_malloc0(sizeof(NBDClient));
client->refcount = 1;
@@ -1314,7 +1304,6 @@ void nbd_client_new(NBDExport *exp,
object_ref(OBJECT(client->ioc));
client->close = close_fn;
- data->client = client;
- data->co = qemu_coroutine_create(nbd_co_client_start, data);
- qemu_coroutine_enter(data->co);
+ co = qemu_coroutine_create(nbd_co_client_start, client);
+ qemu_coroutine_enter(co);
}
--
2.11.1
- [Qemu-devel] [PATCH 05/12] nbd/server: refactor nbd_co_send_reply, (continued)
- [Qemu-devel] [PATCH 05/12] nbd/server: refactor nbd_co_send_reply, Vladimir Sementsov-Ogievskiy, 2017/05/31
- [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 <=
- [Qemu-devel] [PATCH 01/12] nbd: rename read_sync and friends, Vladimir Sementsov-Ogievskiy, 2017/05/31