From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1asYWF-0005ue-Jz for qemu-devel@nongnu.org; Tue, 19 Apr 2016 12:28:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1asYWE-0001re-SI for qemu-devel@nongnu.org; Tue, 19 Apr 2016 12:28:55 -0400 From: Jeff Cody Date: Tue, 19 Apr 2016 12:28:45 -0400 Message-Id: <1461083327-21993-2-git-send-email-jcody@redhat.com> In-Reply-To: <1461083327-21993-1-git-send-email-jcody@redhat.com> References: <1461083327-21993-1-git-send-email-jcody@redhat.com> Subject: [Qemu-devel] [PULL 1/3] block/gluster: return correct error value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: peter.maydell@linaro.org, jcody@redhat.com, qemu-devel@nongnu.org Upon error, gluster will call the aio callback function with a ret value of -1, with errno set to the proper error value. If we set the acb->ret value to the return value in the callback, that results in every error being EPERM (i.e. 1). Instead, set it to the proper error result. Reviewed-by: Niels de Vos Signed-off-by: Jeff Cody --- block/gluster.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/gluster.c b/block/gluster.c index 51e154c..b0e2cc2 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -247,7 +247,7 @@ static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret, void *arg) if (!ret || ret == acb->size) { acb->ret = 0; /* Success */ } else if (ret < 0) { - acb->ret = ret; /* Read/Write failed */ + acb->ret = -errno; /* Read/Write failed */ } else { acb->ret = -EIO; /* Partial read/write - fail it */ } -- 1.9.3