ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nbd/server: Minor cleanups 

Spelling fixes, grammar improvements and consistent spacing, noticed
while preparing other patches in this file.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20211203231539.3900865-2-eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
This commit is contained in:
Eric Blake 2021-12-03 17:15:26 -06:00
parent 10cc95c38f
commit 314b902621
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nbd/server.c
View File

@ -2084,11 +2084,10 @@ static void nbd_extent_array_convert_to_be(NBDExtentArray *ea)
* Add extent to NBDExtentArray. If extent can't be added (no available space), * Add extent to NBDExtentArray. If extent can't be added (no available space),
* return -1. * return -1.
* For safety, when returning -1 for the first time, .can_add is set to false, * For safety, when returning -1 for the first time, .can_add is set to false,
* further call to nbd_extent_array_add() will crash. * and further calls to nbd_extent_array_add() will crash.
* (to avoid the situation, when after failing to add an extent (returned -1), * (this avoids the situation where a caller ignores failure to add one extent,
* user miss this failure and add another extent, which is successfully added * where adding another extent that would squash into the last array entry
* (array is full, but new extent may be squashed into the last one), then we * would result in an incorrect range reported to the client)
* have invalid array with skipped extent)
*/ */
static int nbd_extent_array_add(NBDExtentArray *ea, static int nbd_extent_array_add(NBDExtentArray *ea,
uint32_t length, uint32_t flags) uint32_t length, uint32_t flags)
@ -2287,7 +2286,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());
ret = nbd_receive_request(client, request, errp); ret = nbd_receive_request(client, request, errp);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
trace_nbd_co_receive_request_decode_type(request->handle, request->type, trace_nbd_co_receive_request_decode_type(request->handle, request->type,
@ -2647,7 +2646,7 @@ static coroutine_fn void nbd_trip(void *opaque)
} }
if (ret < 0) { if (ret < 0) {
/* It wans't -EIO, so, according to nbd_co_receive_request() /* It wasn't -EIO, so, according to nbd_co_receive_request()
* semantics, we should return the error to the client. */ * semantics, we should return the error to the client. */
Error *export_err = local_err; Error *export_err = local_err;