From patchwork Tue Nov 3 14:12:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 539420 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3A46E1402D7 for ; Wed, 4 Nov 2015 01:15:41 +1100 (AEDT) Received: from localhost ([::1]:48776 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtcN8-0005Fs-UZ for incoming@patchwork.ozlabs.org; Tue, 03 Nov 2015 09:15:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtcKA-00009f-7x for qemu-devel@nongnu.org; Tue, 03 Nov 2015 09:12:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtcK5-0007YH-JI for qemu-devel@nongnu.org; Tue, 03 Nov 2015 09:12:34 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:8427 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtcK0-0007Vg-He; Tue, 03 Nov 2015 09:12:24 -0500 Received: from hades.sw.ru ([10.30.8.132]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id tA3ECDlR017329; Tue, 3 Nov 2015 17:12:22 +0300 (MSK) From: "Denis V. Lunev" To: Date: Tue, 3 Nov 2015 17:12:08 +0300 Message-Id: <1446559933-28965-6-git-send-email-den@openvz.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1446559933-28965-1-git-send-email-den@openvz.org> References: <1446559933-28965-1-git-send-email-den@openvz.org> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: "Denis V. Lunev" , qemu-devel@nongnu.org, Stefan Hajnoczi , qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 05/10] block: guard bdrv_drain in bdrv_close with aio_context_acquire X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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) {