From nobody Wed Dec 17 21:48:38 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 1498237575543107.60862554362564; Fri, 23 Jun 2017 10:06:15 -0700 (PDT) Received: from localhost ([::1]:36473 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dOS29-0001Ld-0l for importer@patchew.org; Fri, 23 Jun 2017 13:06:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dORMK-0001c5-5O for qemu-devel@nongnu.org; Fri, 23 Jun 2017 12:23:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dORMJ-0007sm-4Z for qemu-devel@nongnu.org; Fri, 23 Jun 2017 12:23:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38206) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dORMG-0007pe-L3; Fri, 23 Jun 2017 12:22:56 -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 A4A337CE12; Fri, 23 Jun 2017 16:22:55 +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 BD3016EC75; Fri, 23 Jun 2017 16:22:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A4A337CE12 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kwolf@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A4A337CE12 From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 23 Jun 2017 18:21:39 +0200 Message-Id: <1498234919-27316-42-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.28]); Fri, 23 Jun 2017 16:22:55 +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 41/61] qed: Add return value to qed_aio_write_l1_update() 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. Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi --- block/qed.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/block/qed.c b/block/qed.c index 5462faa..e43827f 100644 --- a/block/qed.c +++ b/block/qed.c @@ -958,18 +958,12 @@ static void qed_aio_complete(QEDAIOCB *acb, int ret) /** * Update L1 table with new L2 table offset and write it out */ -static void qed_aio_write_l1_update(void *opaque, int ret) +static int qed_aio_write_l1_update(QEDAIOCB *acb) { - QEDAIOCB *acb =3D opaque; BDRVQEDState *s =3D acb_to_s(acb); CachedL2Table *l2_table =3D acb->request.l2_table; uint64_t l2_offset =3D l2_table->offset; - int index; - - if (ret) { - qed_aio_complete(acb, ret); - return; - } + int index, ret; =20 index =3D qed_l1_index(s, acb->cur_pos); s->l1_table->offsets[index] =3D l2_table->offset; @@ -985,7 +979,7 @@ static void qed_aio_write_l1_update(void *opaque, int r= et) acb->request.l2_table =3D qed_find_l2_cache_entry(&s->l2_cache, l2_off= set); assert(acb->request.l2_table !=3D NULL); =20 - qed_aio_next_io(acb, ret); + return ret; } =20 =20 @@ -1014,7 +1008,12 @@ static void qed_aio_write_l2_update(QEDAIOCB *acb, i= nt ret, uint64_t offset) if (need_alloc) { /* Write out the whole new L2 table */ ret =3D qed_write_l2_table(s, &acb->request, 0, s->table_nelems, t= rue); - qed_aio_write_l1_update(acb, ret); + if (ret) { + goto err; + } + ret =3D qed_aio_write_l1_update(acb); + qed_aio_next_io(acb, ret); + } else { /* Write out only the updated part of the L2 table */ ret =3D qed_write_l2_table(s, &acb->request, index, acb->cur_nclus= ters, --=20 1.8.3.1