diff options
Diffstat (limited to 'nbd')
| -rw-r--r-- | nbd/server.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/nbd/server.c b/nbd/server.c index 3d0f024193..5f292064af 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -1366,6 +1366,10 @@ static int coroutine_fn nbd_co_send_structured_error(NBDClient *client, return nbd_co_send_iov(client, iov, 1 + !!iov[1].iov_len, errp); } +/* Do a sparse read and send the structured reply to the client. + * Returns -errno if sending fails. bdrv_block_status_above() failure is + * reported to the client, at which point this function succeeds. + */ static int coroutine_fn nbd_co_send_sparse_read(NBDClient *client, uint64_t handle, uint64_t offset, @@ -1386,8 +1390,13 @@ static int coroutine_fn nbd_co_send_sparse_read(NBDClient *client, bool final; if (status < 0) { - error_setg_errno(errp, -status, "unable to check for holes"); - return status; + char *msg = g_strdup_printf("unable to check for holes: %s", + strerror(-status)); + + ret = nbd_co_send_structured_error(client, handle, -status, msg, + errp); + g_free(msg); + return ret; } assert(pnum && pnum <= size - progress); final = progress + pnum == size; @@ -1568,7 +1577,7 @@ static coroutine_fn void nbd_trip(void *opaque) request.from, req->data, request.len, &local_err); if (ret < 0) { - goto reply; + goto replied; } goto done; } @@ -1665,6 +1674,8 @@ reply: req->data, reply_data_len, &local_err); } g_free(msg); + +replied: if (ret < 0) { error_prepend(&local_err, "Failed to send reply: "); goto disconnect; |