From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFpKK-0006Yw-LM for qemu-devel@nongnu.org; Mon, 26 Jan 2015 14:28:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YFpKD-0001hg-8O for qemu-devel@nongnu.org; Mon, 26 Jan 2015 14:28:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54891) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFpKD-0001hI-0Y for qemu-devel@nongnu.org; Mon, 26 Jan 2015 14:27:53 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0QJRqDX013878 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 26 Jan 2015 14:27:52 -0500 From: Max Reitz Date: Mon, 26 Jan 2015 14:27:29 -0500 Message-Id: <1422300468-16216-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1422300468-16216-1-git-send-email-mreitz@redhat.com> References: <1422300468-16216-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 02/21] quorum: Fix close path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Markus Armbruster , Stefan Hajnoczi , Max Reitz bdrv_unref() can lead to bdrv_close(), which in turn will result in bdrv_drain_all(). This function will later be called blk_drain_all() and iterate only over the BlockBackends for which blk_is_inserted() holds true; therefore, bdrv_is_inserted() and thus quorum_is_inserted() will probably be called. This patch makes quorum_is_inserted() aware of the fact that some children may have been closed already. Signed-off-by: Max Reitz --- block/quorum.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/quorum.c b/block/quorum.c index 7811c4a..b249d75 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -1005,6 +1005,7 @@ static void quorum_close(BlockDriverState *bs) for (i = 0; i < s->num_children; i++) { bdrv_unref(s->bs[i]); + s->bs[i] = NULL; } g_free(s->bs); @@ -1070,7 +1071,7 @@ static int quorum_is_inserted(BlockDriverState *bs) int i; for (i = 0; i < s->num_children; i++) { - if (!bdrv_is_inserted(s->bs[i])) { + if (s->bs[i] && !bdrv_is_inserted(s->bs[i])) { return 0; } } -- 2.1.0