From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 297D4C4CEC9 for ; Wed, 18 Sep 2019 09:57:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 00710218AF for ; Wed, 18 Sep 2019 09:57:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 00710218AF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAWi1-0006J8-Ol for qemu-devel@archiver.kernel.org; Wed, 18 Sep 2019 05:57:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59201) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAWd4-00013m-Os for qemu-devel@nongnu.org; Wed, 18 Sep 2019 05:52:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAWd2-0005Yp-Le for qemu-devel@nongnu.org; Wed, 18 Sep 2019 05:52:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46248) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iAWcv-0005VG-3X; Wed, 18 Sep 2019 05:51:58 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9096586663; Wed, 18 Sep 2019 09:51:55 +0000 (UTC) Received: from localhost (ovpn-116-168.ams2.redhat.com [10.36.116.168]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8EF8F5D6A5; Wed, 18 Sep 2019 09:51:52 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 18 Sep 2019 11:51:37 +0200 Message-Id: <20190918095144.955-2-mreitz@redhat.com> In-Reply-To: <20190918095144.955-1-mreitz@redhat.com> References: <20190918095144.955-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 18 Sep 2019 09:51:55 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/8] block: Handle filter truncation like native impl. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-devel@nongnu.org, Maxim Levitsky , Stefan Hajnoczi , Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make the filter truncation (passing it through to bs->file) a first-class citizen and handle it exactly as if it was the filter driver's native implementation of .bdrv_co_truncate(). I do not see a reason not to, it makes the code a bit shorter, and may be even more correct because this gets us to finish the write_req that we prepared before (may be important to e.g. bring dirty bitmaps to the correct size). Signed-off-by: Max Reitz --- block/io.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/block/io.c b/block/io.c index f8c3596131..723655c792 100644 --- a/block/io.c +++ b/block/io.c @@ -3299,20 +3299,19 @@ int coroutine_fn bdrv_co_truncate(BdrvChild *chil= d, int64_t offset, goto out; } =20 - if (!drv->bdrv_co_truncate) { - if (bs->file && drv->is_filter) { - ret =3D bdrv_co_truncate(bs->file, offset, prealloc, errp); - goto out; - } + if (drv->bdrv_co_truncate) { + ret =3D drv->bdrv_co_truncate(bs, offset, prealloc, errp); + } else if (bs->file && drv->is_filter) { + ret =3D bdrv_co_truncate(bs->file, offset, prealloc, errp); + } else { error_setg(errp, "Image format driver does not support resize"); ret =3D -ENOTSUP; goto out; } - - ret =3D drv->bdrv_co_truncate(bs, offset, prealloc, errp); if (ret < 0) { goto out; } + ret =3D refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS); if (ret < 0) { error_setg_errno(errp, -ret, "Could not refresh total sector cou= nt"); --=20 2.21.0