david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nbd/server: get rid of EAGAIN dead code

Browse Source 
For now nbd_read never returns EAGAIN. So, don't handle it.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170602150150.258222-7-vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2017-06-02 18:01:44 +03:00 committed by Paolo Bonzini
parent 572b97e722
commit 2a6e128bfa
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nbd/server.c
View File

@ -997,11 +997,12 @@ static int nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len)
return rc; return rc;
} }
/* Collect a client request. Return 0 if request looks valid, -EAGAIN /* nbd_co_receive_request
* to keep trying the collection, -EIO to drop connection right away, * Collect a client request. Return 0 if request looks valid, -EIO to drop
* and any other negative value to report an error to the client * connection right away, and any other negative value to report an error to
* (although the caller may still need to disconnect after reporting * the client (although the caller may still need to disconnect after reporting
* the error). */ * the error).
*/
static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request) static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request)
{ {
NBDClient *client = req->client; NBDClient *client = req->client;
@ -1011,9 +1012,7 @@ static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request)
assert(client->recv_coroutine == qemu_coroutine_self()); assert(client->recv_coroutine == qemu_coroutine_self());
rc = nbd_receive_request(client->ioc, request); rc = nbd_receive_request(client->ioc, request);
if (rc < 0) { if (rc < 0) {
if (rc != -EAGAIN) { rc = -EIO;
rc = -EIO;
}
goto out; goto out;
} }
@ -1114,9 +1113,6 @@ static coroutine_fn void nbd_trip(void *opaque)
req = nbd_request_get(client); req = nbd_request_get(client);
ret = nbd_co_receive_request(req, &request); ret = nbd_co_receive_request(req, &request);
if (ret == -EAGAIN) {
goto done;
}
if (ret == -EIO) { if (ret == -EIO) {
goto out; goto out;
} }