From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNvm4-0004nv-CY for qemu-devel@nongnu.org; Tue, 17 Feb 2015 22:58:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YNvm1-0005Om-2g for qemu-devel@nongnu.org; Tue, 17 Feb 2015 22:58:08 -0500 Received: from mail-ie0-f175.google.com ([209.85.223.175]:39167) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNvm0-0005OZ-V5 for qemu-devel@nongnu.org; Tue, 17 Feb 2015 22:58:05 -0500 Received: by iecvy18 with SMTP id vy18so45908042iec.6 for ; Tue, 17 Feb 2015 19:58:04 -0800 (PST) From: Liu Yuan Date: Wed, 18 Feb 2015 11:57:55 +0800 Message-Id: <1424231875-7131-1-git-send-email-namei.unix@gmail.com> Subject: [Qemu-devel] [PATCH v2] sheepdog: fix confused return values List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: sheepdog@lists.wpkg.org Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi , Markus Armbruster From: Liu Yuan 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 Cc: Kevin Wolf Cc: Stefan Hajnoczi Reported-by: Markus Armbruster Signed-off-by: Liu Yuan --- 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