OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

nbd/server: do not use NBDReply structure

Browse Source 
NBDReply structure will be upgraded in future patches to handle both
simple and structured replies and will be used only in the client

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20171012095319.136610-6-vsementsov@virtuozzo.com>
[eblake: rebase to tweaks earlier in series]
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2017-10-12 17:05:06 -05:00 committed by Eric Blake
parent caad53845a
commit 14cea41d39
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
nbd/server.c
View File

@ -1196,18 +1196,20 @@ static inline void set_be_simple_reply(NBDSimpleReply *reply, uint64_t error,
stq_be_p(&reply->handle, handle); stq_be_p(&reply->handle, handle);
} }
static int nbd_co_send_simple_reply(NBDRequestData *req, NBDReply *reply, static int nbd_co_send_simple_reply(NBDRequestData *req,
uint64_t handle,
uint32_t error,
int len, Error **errp) int len, Error **errp)
{ {
NBDClient *client = req->client; NBDClient *client = req->client;
NBDSimpleReply simple_reply; NBDSimpleReply simple_reply;
int nbd_err = system_errno_to_nbd_errno(reply->error); int nbd_err = system_errno_to_nbd_errno(error);
int ret; int ret;
g_assert(qemu_in_coroutine()); g_assert(qemu_in_coroutine());
trace_nbd_co_send_simple_reply(reply->handle, nbd_err, len); trace_nbd_co_send_simple_reply(handle, nbd_err, len);
set_be_simple_reply(&simple_reply, nbd_err, reply->handle); set_be_simple_reply(&simple_reply, nbd_err, handle);
qemu_co_mutex_lock(&client->send_lock); qemu_co_mutex_lock(&client->send_lock);
client->send_coroutine = qemu_coroutine_self(); client->send_coroutine = qemu_coroutine_self();
@ -1322,7 +1324,6 @@ static coroutine_fn void nbd_trip(void *opaque)
NBDExport *exp = client->exp; NBDExport *exp = client->exp;
NBDRequestData *req; NBDRequestData *req;
NBDRequest request = { 0 }; /* GCC thinks it can be used uninitialized */ NBDRequest request = { 0 }; /* GCC thinks it can be used uninitialized */
NBDReply reply;
int ret; int ret;
int flags; int flags;
int reply_data_len = 0; int reply_data_len = 0;
@ -1342,11 +1343,7 @@ static coroutine_fn void nbd_trip(void *opaque)
goto disconnect; goto disconnect;
} }
reply.handle = request.handle;
reply.error = 0;
if (ret < 0) { if (ret < 0) {
reply.error = -ret;
goto reply; goto reply;
} }
@ -1365,7 +1362,6 @@ static coroutine_fn void nbd_trip(void *opaque)
ret = blk_co_flush(exp->blk); ret = blk_co_flush(exp->blk);
if (ret < 0) { if (ret < 0) {
error_setg_errno(&local_err, -ret, "flush failed"); error_setg_errno(&local_err, -ret, "flush failed");
reply.error = -ret;
break; break;
} }
} }
@ -1374,7 +1370,6 @@ static coroutine_fn void nbd_trip(void *opaque)
req->data, request.len); req->data, request.len);
if (ret < 0) { if (ret < 0) {
error_setg_errno(&local_err, -ret, "reading from file failed"); error_setg_errno(&local_err, -ret, "reading from file failed");
reply.error = -ret;
break; break;
} }
@ -1383,7 +1378,7 @@ static coroutine_fn void nbd_trip(void *opaque)
break; break;
case NBD_CMD_WRITE: case NBD_CMD_WRITE:
if (exp->nbdflags & NBD_FLAG_READ_ONLY) { if (exp->nbdflags & NBD_FLAG_READ_ONLY) {
reply.error = EROFS; ret = -EROFS;
break; break;
} }
@ -1395,14 +1390,13 @@ static coroutine_fn void nbd_trip(void *opaque)
req->data, request.len, flags); req->data, request.len, flags);
if (ret < 0) { if (ret < 0) {
error_setg_errno(&local_err, -ret, "writing to file failed"); error_setg_errno(&local_err, -ret, "writing to file failed");
reply.error = -ret;
} }
break; break;
case NBD_CMD_WRITE_ZEROES: case NBD_CMD_WRITE_ZEROES:
if (exp->nbdflags & NBD_FLAG_READ_ONLY) { if (exp->nbdflags & NBD_FLAG_READ_ONLY) {
error_setg(&local_err, "Server is read-only, return error"); error_setg(&local_err, "Server is read-only, return error");
reply.error = EROFS; ret = -EROFS;
break; break;
} }
@ -1417,7 +1411,6 @@ static coroutine_fn void nbd_trip(void *opaque)
request.len, flags); request.len, flags);
if (ret < 0) { if (ret < 0) {
error_setg_errno(&local_err, -ret, "writing to file failed"); error_setg_errno(&local_err, -ret, "writing to file failed");
reply.error = -ret;
} }
break; break;
@ -1429,7 +1422,6 @@ static coroutine_fn void nbd_trip(void *opaque)
ret = blk_co_flush(exp->blk); ret = blk_co_flush(exp->blk);
if (ret < 0) { if (ret < 0) {
error_setg_errno(&local_err, -ret, "flush failed"); error_setg_errno(&local_err, -ret, "flush failed");
reply.error = -ret;
} }
break; break;
@ -1438,25 +1430,27 @@ static coroutine_fn void nbd_trip(void *opaque)
request.len); request.len);
if (ret < 0) { if (ret < 0) {
error_setg_errno(&local_err, -ret, "discard failed"); error_setg_errno(&local_err, -ret, "discard failed");
reply.error = -ret;
} }
break; break;
default: default:
error_setg(&local_err, "invalid request type (%" PRIu32 ") received", error_setg(&local_err, "invalid request type (%" PRIu32 ") received",
request.type); request.type);
reply.error = EINVAL; ret = -EINVAL;
} }
reply: reply:
if (local_err) { if (local_err) {
/* If we are here local_err is not fatal error, already stored in /* If we get here, local_err was not a fatal error, and should be sent
* reply.error */ * to the client. */
error_report_err(local_err); error_report_err(local_err);
local_err = NULL; local_err = NULL;
} }
if (nbd_co_send_simple_reply(req, &reply, reply_data_len, &local_err) < 0) { if (nbd_co_send_simple_reply(req, request.handle,
ret < 0 ? -ret : 0,
reply_data_len, &local_err) < 0)
{
error_prepend(&local_err, "Failed to send reply: "); error_prepend(&local_err, "Failed to send reply: ");
goto disconnect; goto disconnect;
} }