From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9sDL-0001GH-45 for qemu-devel@nongnu.org; Mon, 06 Jun 2016 06:56:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9sDJ-0005co-AR for qemu-devel@nongnu.org; Mon, 06 Jun 2016 06:56:58 -0400 From: Kevin Wolf Date: Mon, 6 Jun 2016 12:56:44 +0200 Message-Id: <1465210604-11661-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH] block: Fix bdrv_all_delete_snapshot() error handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org The code to exit the loop after bdrv_snapshot_delete_by_id_or_name() returned failure was duplicated. The first copy of it was too early so that the AioContext lock would not be freed. This patch removes it so that only the second, correct copy remains. Signed-off-by: Kevin Wolf --- block/snapshot.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/block/snapshot.c b/block/snapshot.c index 6e6e34f..da89d2b 100644 --- a/block/snapshot.c +++ b/block/snapshot.c @@ -409,9 +409,6 @@ int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bad_bs, if (bdrv_can_snapshot(bs) && bdrv_snapshot_find(bs, snapshot, name) >= 0) { ret = bdrv_snapshot_delete_by_id_or_name(bs, name, err); - if (ret < 0) { - goto fail; - } } aio_context_release(ctx); if (ret < 0) { -- 1.8.3.1