From nobody Wed Nov 5 14:26:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1535063488255107.1651970162934; Thu, 23 Aug 2018 15:31:28 -0700 (PDT) Received: from localhost ([::1]:39049 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsy8P-0006NO-5j for importer@patchew.org; Thu, 23 Aug 2018 18:31:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsy0N-0005dY-6y for qemu-devel@nongnu.org; Thu, 23 Aug 2018 18:23:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fsy0L-0001G3-CW for qemu-devel@nongnu.org; Thu, 23 Aug 2018 18:23:03 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:53798 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fsy0H-00018O-2q; Thu, 23 Aug 2018 18:22:57 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BA45340216E7; Thu, 23 Aug 2018 22:22:56 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-97.bos.redhat.com [10.18.17.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CF43B2795; Thu, 23 Aug 2018 22:22:56 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Thu, 23 Aug 2018 18:22:41 -0400 Message-Id: <20180823222249.13518-6-jsnow@redhat.com> In-Reply-To: <20180823222249.13518-1-jsnow@redhat.com> References: <20180823222249.13518-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 23 Aug 2018 22:22:56 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 23 Aug 2018 22:22:56 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jsnow@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 05/13] block/mirror: conservative mirror_exit refactor 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: kwolf@redhat.com, John Snow , Jeff Cody , Markus Armbruster , Max Reitz , jtc@redhat.com, "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" For purposes of minimum code movement, refactor the mirror_exit callback to use the post-finalization callbacks in a trivial way. Signed-off-by: John Snow --- block/mirror.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index 837279e979..f5b504406d 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -79,6 +79,7 @@ typedef struct MirrorBlockJob { int max_iov; bool initial_zeroing_ongoing; int in_active_write_counter; + bool prepared; } MirrorBlockJob; =20 typedef struct MirrorBDSOpaque { @@ -607,7 +608,7 @@ static void mirror_wait_for_all_io(MirrorBlockJob *s) } } =20 -static void mirror_exit(Job *job) +static int mirror_exit_common(Job *job) { MirrorBlockJob *s =3D container_of(job, MirrorBlockJob, common.job); BlockJob *bjob =3D &s->common; @@ -619,6 +620,11 @@ static void mirror_exit(Job *job) Error *local_err =3D NULL; int ret =3D job->ret; =20 + if (s->prepared) { + return ret; + } + s->prepared =3D true; + bdrv_release_dirty_bitmap(src, s->dirty_bitmap); =20 /* Make sure that the source BDS doesn't go away before we called @@ -711,7 +717,17 @@ static void mirror_exit(Job *job) bdrv_unref(mirror_top_bs); bdrv_unref(src); =20 - job->ret =3D ret; + return ret; +} + +static int mirror_prepare(Job *job) +{ + return mirror_exit_common(job); +} + +static void mirror_abort(Job *job) +{ + mirror_exit_common(job); } =20 static void mirror_throttle(MirrorBlockJob *s) @@ -1132,7 +1148,8 @@ static const BlockJobDriver mirror_job_driver =3D { .user_resume =3D block_job_user_resume, .drain =3D block_job_drain, .run =3D mirror_run, - .exit =3D mirror_exit, + .prepare =3D mirror_prepare, + .abort =3D mirror_abort, .pause =3D mirror_pause, .complete =3D mirror_complete, }, @@ -1149,7 +1166,8 @@ static const BlockJobDriver commit_active_job_driver = =3D { .user_resume =3D block_job_user_resume, .drain =3D block_job_drain, .run =3D mirror_run, - .exit =3D mirror_exit, + .prepare =3D mirror_prepare, + .abort =3D mirror_abort, .pause =3D mirror_pause, .complete =3D mirror_complete, }, --=20 2.14.4