From nobody Wed Dec 17 21:57:32 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1498238199385302.5660380401514; Fri, 23 Jun 2017 10:16:39 -0700 (PDT) Received: from localhost ([::1]:36537 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dOSCD-0002ur-Qd for importer@patchew.org; Fri, 23 Jun 2017 13:16:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dORMT-0001nR-5a for qemu-devel@nongnu.org; Fri, 23 Jun 2017 12:23:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dORMS-00081T-1E for qemu-devel@nongnu.org; Fri, 23 Jun 2017 12:23:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44258) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dORMK-0007tN-98; Fri, 23 Jun 2017 12:23:00 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4A9EEC00065F; Fri, 23 Jun 2017 16:22:59 +0000 (UTC) Received: from noname.redhat.com (ovpn-117-196.ams2.redhat.com [10.36.117.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 62F366EC75; Fri, 23 Jun 2017 16:22:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4A9EEC00065F Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kwolf@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 4A9EEC00065F From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 23 Jun 2017 18:21:42 +0200 Message-Id: <1498234919-27316-45-git-send-email-kwolf@redhat.com> In-Reply-To: <1498234919-27316-1-git-send-email-kwolf@redhat.com> References: <1498234919-27316-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 23 Jun 2017 16:22:59 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 44/61] qed: Add return value to qed_aio_write_cow() 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, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Don't recurse into qed_aio_next_io() and qed_aio_complete() here, but just return an error code and let the caller handle it. While refactoring qed_aio_write_alloc() to accomodate the change, qed_aio_write_zero_cluster() ended up with a single line, so I chose to inline that line and remove the function completely. Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi --- block/qed.c | 58 +++++++++++++++++++++------------------------------------- 1 file changed, 21 insertions(+), 37 deletions(-) diff --git a/block/qed.c b/block/qed.c index a4b13f8..84864e0 100644 --- a/block/qed.c +++ b/block/qed.c @@ -1065,11 +1065,11 @@ static int qed_aio_write_main(QEDAIOCB *acb) /** * Populate untouched regions of new data cluster */ -static void qed_aio_write_cow(void *opaque, int ret) +static int qed_aio_write_cow(QEDAIOCB *acb) { - QEDAIOCB *acb =3D opaque; BDRVQEDState *s =3D acb_to_s(acb); uint64_t start, len, offset; + int ret; =20 /* Populate front untouched region of new data cluster */ start =3D qed_start_of_cluster(s, acb->cur_pos); @@ -1077,9 +1077,8 @@ static void qed_aio_write_cow(void *opaque, int ret) =20 trace_qed_aio_write_prefill(s, acb, start, len, acb->cur_cluster); ret =3D qed_copy_from_backing_file(s, start, len, acb->cur_cluster); - if (ret) { - qed_aio_complete(acb, ret); - return; + if (ret < 0) { + return ret; } =20 /* Populate back untouched region of new data cluster */ @@ -1091,17 +1090,11 @@ static void qed_aio_write_cow(void *opaque, int ret) =20 trace_qed_aio_write_postfill(s, acb, start, len, offset); ret =3D qed_copy_from_backing_file(s, start, len, offset); - if (ret) { - qed_aio_complete(acb, ret); - return; - } - - ret =3D qed_aio_write_main(acb); if (ret < 0) { - qed_aio_complete(acb, ret); - return; + return ret; } - qed_aio_next_io(acb, 0); + + return qed_aio_write_main(acb); } =20 /** @@ -1117,23 +1110,6 @@ static bool qed_should_set_need_check(BDRVQEDState *= s) return !(s->header.features & QED_F_NEED_CHECK); } =20 -static void qed_aio_write_zero_cluster(void *opaque, int ret) -{ - QEDAIOCB *acb =3D opaque; - - if (ret) { - qed_aio_complete(acb, ret); - return; - } - - ret =3D qed_aio_write_l2_update(acb, 1); - if (ret < 0) { - qed_aio_complete(acb, ret); - return; - } - qed_aio_next_io(acb, 0); -} - /** * Write new data cluster * @@ -1145,7 +1121,6 @@ static void qed_aio_write_zero_cluster(void *opaque, = int ret) static void qed_aio_write_alloc(QEDAIOCB *acb, size_t len) { BDRVQEDState *s =3D acb_to_s(acb); - BlockCompletionFunc *cb; int ret; =20 /* Cancel timer when the first allocating request comes in */ @@ -1172,20 +1147,29 @@ static void qed_aio_write_alloc(QEDAIOCB *acb, size= _t len) qed_aio_start_io(acb); return; } - - cb =3D qed_aio_write_zero_cluster; } else { - cb =3D qed_aio_write_cow; acb->cur_cluster =3D qed_alloc_clusters(s, acb->cur_nclusters); } =20 if (qed_should_set_need_check(s)) { s->header.features |=3D QED_F_NEED_CHECK; ret =3D qed_write_header(s); - cb(acb, ret); + if (ret < 0) { + qed_aio_complete(acb, ret); + return; + } + } + + if (acb->flags & QED_AIOCB_ZERO) { + ret =3D qed_aio_write_l2_update(acb, 1); } else { - cb(acb, 0); + ret =3D qed_aio_write_cow(acb); } + if (ret < 0) { + qed_aio_complete(acb, ret); + return; + } + qed_aio_next_io(acb, 0); } =20 /** --=20 1.8.3.1