From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34357)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <namei.unix@gmail.com>) id 1XFcmN-0001MI-V0
	for qemu-devel@nongnu.org; Fri, 08 Aug 2014 01:31:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <namei.unix@gmail.com>) id 1XFcmH-0007KS-S5
	for qemu-devel@nongnu.org; Fri, 08 Aug 2014 01:31:51 -0400
Received: from mail-pd0-x22f.google.com ([2607:f8b0:400e:c02::22f]:53017)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <namei.unix@gmail.com>) id 1XFcmH-0007KG-Kb
	for qemu-devel@nongnu.org; Fri, 08 Aug 2014 01:31:45 -0400
Received: by mail-pd0-f175.google.com with SMTP id r10so6451075pdi.34
	for <qemu-devel@nongnu.org>; Thu, 07 Aug 2014 22:31:44 -0700 (PDT)
Date: Fri, 8 Aug 2014 13:31:39 +0800
From: Liu Yuan <namei.unix@gmail.com>
Message-ID: <20140808053139.GE12057@ubuntu-trusty>
References: <1407396520-2720-1-git-send-email-mitake.hitoshi@lab.ntt.co.jp>
	<1407396520-2720-3-git-send-email-mitake.hitoshi@lab.ntt.co.jp>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1407396520-2720-3-git-send-email-mitake.hitoshi@lab.ntt.co.jp>
Subject: Re: [Qemu-devel] [PATCH 2/2] sheepdog: improve error handling for a
 case of failed lock
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Hitoshi Mitake <mitake.hitoshi@lab.ntt.co.jp>
Cc: Kevin Wolf <kwolf@redhat.com>, sheepdog@lists.wpkg.org, mitake.hitoshi@gmail.com, qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>, MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>

On Thu, Aug 07, 2014 at 04:28:40PM +0900, Hitoshi Mitake wrote:
> Recently, sheepdog revived its VDI locking functionality. This patch
> updates sheepdog driver of QEMU for this feature:
> 
> 1. Improve error message when QEMU fails to acquire lock of
> VDI. Current sheepdog driver prints an error message "VDI isn't
> locked" when it fails to acquire lock. It is a little bit confusing
> because the mesage says VDI isn't locked but it is actually locked by
> other VM. This patch modifies this confusing message.
> 
> 2. Change error code for a case of failed locking. -EBUSY is a
> suitable one.
> 
> Reported-by: Valerio Pachera <sirio81@gmail.com>
> Cc: Kevin Wolf <kwolf@redhat.com>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Cc: Liu Yuan <namei.unix@gmail.com>
> Cc: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
> Signed-off-by: Hitoshi Mitake <mitake.hitoshi@lab.ntt.co.jp>
> ---
>  block/sheepdog.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/block/sheepdog.c b/block/sheepdog.c
> index 36f76f0..0b3f86d 100644
> --- a/block/sheepdog.c
> +++ b/block/sheepdog.c
> @@ -1112,9 +1112,13 @@ static int find_vdi_name(BDRVSheepdogState *s, const char *filename,
>  
>      if (rsp->result != SD_RES_SUCCESS) {
>          error_setg(errp, "cannot get vdi info, %s, %s %" PRIu32 " %s",
> +                   rsp->result == SD_RES_VDI_NOT_LOCKED ?

I'm puzzled by this check.

we use SD_RES_VDI_LOCKED to indicate vid is already locked, no?

> +                   "VDI is already locked by other VM" :
>                     sd_strerror(rsp->result), filename, snapid, tag);
>          if (rsp->result == SD_RES_NO_VDI) {
>              ret = -ENOENT;
> +        } else if (rsp->result == SD_RES_VDI_NOT_LOCKED) {
> +            ret = -EBUSY;
>          } else {
>              ret = -EIO;
>          }

It is better to use switch case to handle the result.

Thanks
Yuan