From patchwork Thu Jun 16 06:58:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 636232 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 3rVZ7x5Ddsz9s9G for ; Thu, 16 Jun 2016 17:02:21 +1000 (AEST) Received: from localhost ([::1]:46832 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDRJj-0003Pr-G7 for incoming@patchwork.ozlabs.org; Thu, 16 Jun 2016 03:02:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDRG5-0000s6-P1 for qemu-devel@nongnu.org; Thu, 16 Jun 2016 02:58:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDRG1-0004Fh-4d for qemu-devel@nongnu.org; Thu, 16 Jun 2016 02:58:33 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:47670 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDRG0-0004EC-N5 for qemu-devel@nongnu.org; Thu, 16 Jun 2016 02:58:29 -0400 Received: from hades.sw.ru ([10.30.8.132]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u5G6w7b3009916; Thu, 16 Jun 2016 09:58:15 +0300 (MSK) From: "Denis V. Lunev" To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Thu, 16 Jun 2016 09:58:07 +0300 Message-Id: <1466060287-31514-4-git-send-email-den@openvz.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1466060287-31514-1-git-send-email-den@openvz.org> References: <1466060287-31514-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 Subject: [Qemu-devel] [PATCH 3/3] block: process before_write_notifiers in bdrv_co_discard X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Vladimir Sementsov-Ogievskiy , Fam Zheng , Max Reitz , Stefan Hajnoczi , den@openvz.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This is mandatory for correct backup creation. In the other case the content under this area would be lost. Dirty bits are set exactly like in bdrv_aligned_pwritev, i.e. they are set even if notifier has returned a error. Signed-off-by: Denis V. Lunev CC: Vladimir Sementsov-Ogievskiy CC: Stefan Hajnoczi CC: Fam Zheng CC: Kevin Wolf CC: Max Reitz Reviewed-by: Fam Zheng --- block/io.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/io.c b/block/io.c index 513bd99..92d9fe3 100644 --- a/block/io.c +++ b/block/io.c @@ -2266,6 +2266,11 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, tracked_request_begin(&req, bs, NULL, sector_num << BDRV_SECTOR_BITS, nb_sectors << BDRV_SECTOR_BITS, BDRV_TRACKED_DISCARD); + ret = notifier_with_return_list_notify(&bs->before_write_notifiers, &req); + if (ret < 0) { + goto out; + } + max_discard = MIN_NON_ZERO(bs->bl.max_discard, BDRV_REQUEST_MAX_SECTORS); while (nb_sectors > 0) { int ret;