From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNP4W-0007aO-Sw for qemu-devel@nongnu.org; Fri, 29 Aug 2014 12:30:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNP4R-0002rM-Lx for qemu-devel@nongnu.org; Fri, 29 Aug 2014 12:30:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26884) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNP4R-0002rD-EO for qemu-devel@nongnu.org; Fri, 29 Aug 2014 12:30:39 -0400 From: Stefan Hajnoczi Date: Fri, 29 Aug 2014 17:29:35 +0100 Message-Id: <1409329803-20744-8-git-send-email-stefanha@redhat.com> In-Reply-To: <1409329803-20744-1-git-send-email-stefanha@redhat.com> References: <1409329803-20744-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 07/35] sheepdog: improve error handling for a case of failed lock List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Hitoshi Mitake , MORITA Kazutaka , Stefan Hajnoczi , Liu Yuan From: Hitoshi Mitake Recently, sheepdog revived its VDI locking functionality. This patch updates sheepdog driver of QEMU for this feature. It changes an error code for a case of failed locking. -EBUSY is a suitable one. Reported-by: Valerio Pachera Cc: Kevin Wolf Cc: Stefan Hajnoczi Cc: Liu Yuan Cc: MORITA Kazutaka Signed-off-by: Hitoshi Mitake Signed-off-by: Stefan Hajnoczi --- block/sheepdog.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/sheepdog.c b/block/sheepdog.c index 93c0266..49a9a9e 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -1115,6 +1115,8 @@ static int find_vdi_name(BDRVSheepdogState *s, const char *filename, sd_strerror(rsp->result), filename, snapid, tag); if (rsp->result == SD_RES_NO_VDI) { ret = -ENOENT; + } else if (rsp->result == SD_RES_VDI_LOCKED) { + ret = -EBUSY; } else { ret = -EIO; } -- 1.9.3