From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39331) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agqC7-00023c-VP for qemu-devel@nongnu.org; Fri, 18 Mar 2016 04:55:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agqC3-0007Gs-QY for qemu-devel@nongnu.org; Fri, 18 Mar 2016 04:55:43 -0400 Received: from tama500.ecl.ntt.co.jp ([129.60.39.148]:50145) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agqC3-0007GV-5P for qemu-devel@nongnu.org; Fri, 18 Mar 2016 04:55:39 -0400 From: Takashi Menjo Date: Fri, 18 Mar 2016 17:54:38 +0900 Message-Id: <1458291278-5460-1-git-send-email-menjo.takashi@lab.ntt.co.jp> Subject: [Qemu-devel] [PATCH] block/sheepdog: add error handling to sd_snapshot_delete() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Hitoshi Mitake , Takashi Menjo , Jeff Cody , sheepdog@lists.wpkg.org, Vasiliy Tolstov Errors have been ignored in some code paths in sd_snapshot_delete(). This patch adds error handling. Signed-off-by: Takashi Menjo --- block/sheepdog.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/sheepdog.c b/block/sheepdog.c index a3aeae4..6492405 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -2565,6 +2565,7 @@ static int sd_snapshot_delete(BlockDriverState *bs, SheepdogVdiRsp *rsp = (SheepdogVdiRsp *)&hdr; if (!remove_objects(s)) { + error_report("failed to discard snapshot inode"); return -1; } @@ -2588,6 +2589,7 @@ static int sd_snapshot_delete(BlockDriverState *bs, ret = find_vdi_name(s, s->name, snap_id, snap_tag, &vid, true, &local_err); if (ret) { + error_report_err(local_err); return ret; } @@ -2601,6 +2603,7 @@ static int sd_snapshot_delete(BlockDriverState *bs, buf, &wlen, &rlen); closesocket(fd); if (ret) { + error_setg_errno(errp, -ret, "failed to delete %s", s->name); return ret; } -- 2.7.4.windows.1