| Message ID | 20211203231539.3900865-2-eblake@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | qemu patches for NBD_OPT_EXTENDED_HEADERS | expand |
04.12.2021 02:15, Eric Blake wrote: > Spelling fixes, grammar improvements and consistent spacing, noticed > while preparing other patches in this file. > > Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > --- > nbd/server.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/nbd/server.c b/nbd/server.c > index 4630dd732250..f302e1cbb03e 100644 > --- a/nbd/server.c > +++ b/nbd/server.c > @@ -2085,11 +2085,10 @@ static void nbd_extent_array_convert_to_be(NBDExtentArray *ea) > * Add extent to NBDExtentArray. If extent can't be added (no available space), > * return -1. > * For safety, when returning -1 for the first time, .can_add is set to false, > - * further call to nbd_extent_array_add() will crash. > - * (to avoid the situation, when after failing to add an extent (returned -1), > - * user miss this failure and add another extent, which is successfully added > - * (array is full, but new extent may be squashed into the last one), then we > - * have invalid array with skipped extent) > + * and further calls to nbd_extent_array_add() will crash. > + * (this avoids the situation where a caller ignores failure to add one extent, > + * where adding another extent that would squash into the last array entry > + * would result in an incorrect range reported to the client) > */ > static int nbd_extent_array_add(NBDExtentArray *ea, > uint32_t length, uint32_t flags) > @@ -2288,7 +2287,7 @@ static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request, > assert(client->recv_coroutine == qemu_coroutine_self()); > ret = nbd_receive_request(client, request, errp); > if (ret < 0) { > - return ret; > + return ret; > } > > trace_nbd_co_receive_request_decode_type(request->handle, request->type, > @@ -2648,7 +2647,7 @@ static coroutine_fn void nbd_trip(void *opaque) > } > > 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. */ > Error *export_err = local_err; >
diff --git a/nbd/server.c b/nbd/server.c index 4630dd732250..f302e1cbb03e 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -2085,11 +2085,10 @@ static void nbd_extent_array_convert_to_be(NBDExtentArray *ea) * Add extent to NBDExtentArray. If extent can't be added (no available space), * return -1. * For safety, when returning -1 for the first time, .can_add is set to false, - * further call to nbd_extent_array_add() will crash. - * (to avoid the situation, when after failing to add an extent (returned -1), - * user miss this failure and add another extent, which is successfully added - * (array is full, but new extent may be squashed into the last one), then we - * have invalid array with skipped extent) + * and further calls to nbd_extent_array_add() will crash. + * (this avoids the situation where a caller ignores failure to add one extent, + * where adding another extent that would squash into the last array entry + * would result in an incorrect range reported to the client) */ static int nbd_extent_array_add(NBDExtentArray *ea, uint32_t length, uint32_t flags) @@ -2288,7 +2287,7 @@ static int nbd_co_receive_request(NBDRequestData *req, NBDRequest *request, assert(client->recv_coroutine == qemu_coroutine_self()); ret = nbd_receive_request(client, request, errp); if (ret < 0) { - return ret; + return ret; } trace_nbd_co_receive_request_decode_type(request->handle, request->type, @@ -2648,7 +2647,7 @@ static coroutine_fn void nbd_trip(void *opaque) } 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. */ Error *export_err = local_err;
Spelling fixes, grammar improvements and consistent spacing, noticed while preparing other patches in this file. Signed-off-by: Eric Blake <eblake@redhat.com> --- nbd/server.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)