From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDRG8-0000sn-Mm for qemu-devel@nongnu.org; Thu, 16 Jun 2016 02:58:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDRG3-0004KV-2C for qemu-devel@nongnu.org; Thu, 16 Jun 2016 02:58:35 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:6430 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDRG2-0004HS-M4 for qemu-devel@nongnu.org; Thu, 16 Jun 2016 02:58:31 -0400 From: "Denis V. Lunev" Date: Thu, 16 Jun 2016 09:58:06 +0300 Message-Id: <1466060287-31514-3-git-send-email-den@openvz.org> In-Reply-To: <1466060287-31514-1-git-send-email-den@openvz.org> References: <1466060287-31514-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 2/3] block: fix race in bdrv_co_discard with drive-mirror List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-block@nongnu.org Cc: den@openvz.org, Vladimir Sementsov-Ogievskiy , Stefan Hajnoczi , Fam Zheng , Kevin Wolf , Max Reitz Actually we must set dirty bitmap dirty after we have written all our zeroes for correct processing in drive mirror code. In the other case we can face not zeroes in this dirty area there in mirror_iteration. Signed-off-by: Denis V. Lunev CC: Vladimir Sementsov-Ogievskiy CC: Stefan Hajnoczi CC: Fam Zheng CC: Kevin Wolf CC: Max Reitz --- block/io.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/io.c b/block/io.c index b51f681..513bd99 100644 --- a/block/io.c +++ b/block/io.c @@ -2265,7 +2265,6 @@ 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); - bdrv_set_dirty(bs, sector_num, nb_sectors); max_discard = MIN_NON_ZERO(bs->bl.max_discard, BDRV_REQUEST_MAX_SECTORS); while (nb_sectors > 0) { @@ -2314,6 +2313,8 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, } ret = 0; out: + bdrv_set_dirty(bs, req.offset << BDRV_SECTOR_BITS, + req.bytes << BDRV_SECTOR_BITS); tracked_request_end(&req); return ret; } -- 2.5.0