On Wed, Feb 18, 2015 at 11:57:55AM +0800, Liu Yuan wrote:
> 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.
>
> Cc: qemu-devel@nongnu.org
> Cc: Markus Armbruster <arm...@redhat.com>
> Cc: Kevin Wolf <kw...@redhat.com>
> Cc: Stefan Hajnoczi <stefa...@redhat.com>
> Reported-by: Markus Armbruster <arm...@redhat.com>
> Signed-off-by: Liu Yuan <liuy...@cmss.chinamobile.com>
> ---
> v2:
> - use socket_error() instead of errno
>
> block/sheepdog.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/block/sheepdog.c b/block/sheepdog.c
> index be3176f..e4b30ba 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 = -socket_error();
> return ret;
> }
>
> ret = qemu_co_send(sockfd, data, *wlen);
> if (ret != *wlen) {
> + ret = -socket_error();
> 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
>
Ping...
