From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35835) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zu1qN-0001IF-T1 for qemu-devel@nongnu.org; Wed, 04 Nov 2015 12:27:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zu1qN-00065W-0o for qemu-devel@nongnu.org; Wed, 04 Nov 2015 12:27:31 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:35119 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zu1qM-00065L-Ls for qemu-devel@nongnu.org; Wed, 04 Nov 2015 12:27:30 -0500 From: "Denis V. Lunev" Date: Wed, 4 Nov 2015 20:27:24 +0300 Message-Id: <1446658044-22042-4-git-send-email-den@openvz.org> In-Reply-To: <1446658044-22042-1-git-send-email-den@openvz.org> References: <1446658044-22042-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 3/3] block: guard bdrv_drain in bdrv_close with aio_context_acquire List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Denis V. Lunev" , qemu-devel@nongnu.org, Stefan Hajnoczi bdrv_close is called in tooooo much places to properly track at the moment. Signed-off-by: Denis V. Lunev CC: Stefan Hajnoczi --- block.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block.c b/block.c index e9f40dc..98b0b66 100644 --- a/block.c +++ b/block.c @@ -1895,6 +1895,7 @@ void bdrv_reopen_abort(BDRVReopenState *reopen_state) void bdrv_close(BlockDriverState *bs) { BdrvAioNotifier *ban, *ban_next; + AioContext *ctx; if (bs->job) { block_job_cancel_sync(bs->job); @@ -1905,9 +1906,13 @@ void bdrv_close(BlockDriverState *bs) bdrv_io_limits_disable(bs); } + ctx = bdrv_get_aio_context(bs); + aio_context_acquire(ctx); bdrv_drain(bs); /* complete I/O */ bdrv_flush(bs); bdrv_drain(bs); /* in case flush left pending I/O */ + aio_context_release(ctx); + notifier_list_notify(&bs->close_notifiers, bs); if (bs->blk) { -- 2.5.0