From: Liu Yuan <liuy...@cmss.chinamobile.com> These functions mix up -1 and -errno in return values and would might cause trouble error handling in the call chain.
This patch let them return -errno and add some comments. Reported-by: Markus Armbruster <arm...@redhat.com> Signed-off-by: Liu Yuan <liuy...@cmss.chinamobile.com> --- block/sheepdog.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/block/sheepdog.c b/block/sheepdog.c index be3176f..c28658c 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -527,6 +527,7 @@ static SheepdogAIOCB *sd_aio_setup(BlockDriverState *bs, QEMUIOVector *qiov, return acb; } +/* Return -EIO in case of error, file descriptor on success */ static int connect_to_sdog(BDRVSheepdogState *s, Error **errp) { int fd; @@ -546,11 +547,14 @@ static int connect_to_sdog(BDRVSheepdogState *s, Error **errp) if (fd >= 0) { qemu_set_nonblock(fd); + } else { + fd = -EIO; } return fd; } +/* Return 0 on success and -errno in case of error */ static coroutine_fn int send_co_req(int sockfd, SheepdogReq *hdr, void *data, unsigned int *wlen) { @@ -559,11 +563,13 @@ static coroutine_fn int send_co_req(int sockfd, SheepdogReq *hdr, void *data, ret = qemu_co_send(sockfd, hdr, sizeof(*hdr)); if (ret != sizeof(*hdr)) { error_report("failed to send a req, %s", strerror(errno)); + ret = -errno; return ret; } ret = qemu_co_send(sockfd, data, *wlen); if (ret != *wlen) { + ret = -errno; error_report("failed to send a req, %s", strerror(errno)); } @@ -638,6 +644,11 @@ out: srco->finished = true; } +/* + * Send the request to the sheep in a synchronous manner. + * + * Return 0 on success, -errno in case of error. + */ static int do_req(int sockfd, AioContext *aio_context, SheepdogReq *hdr, void *data, unsigned int *wlen, unsigned int *rlen) { -- 1.9.1 -- sheepdog mailing list sheepdog@lists.wpkg.org https://lists.wpkg.org/mailman/listinfo/sheepdog