From nobody Tue Nov 04 04:11:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d0w562jmyz653gG; Tue, 04 Nov 2025 04:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d0w5626zKz4H47; Tue, 04 Nov 2025 04:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762229514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nqWwmebI2/lDU3+50tNDykqtbtupikj6l5sIFnvMw6I=; b=waqb9HPB4zh9UEdYXcX8t3EHLNbztTYBUGgpfimYXmFkYkF904H4Vg5CDbXmwCXEqarf/5 h9jEh7SX5x2tBH2Zc2ABSK/nWQNn198zmxQO459ovZ4JsYuWax7ZJm6+vFJY1nhXeGBjIB oeFPXLtmMCeVHh99sFrCzg3rJ1eBBS8IWGUTqtpHNwrYtkBjTAo1ls+UF/EXrTf8HSdnvs joClhRbOQEPmUt9UV36cszA6oPO2vY9ShYL8GvK49kxKuzE4XJtpldBRFXfa+GWQy5Kr4/ Q86lJsw+p0WbE29Gr+ZkSl1eyL6m/ALOrQYAmEtFoi9aybIkBOzDunj6AxpoWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762229514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nqWwmebI2/lDU3+50tNDykqtbtupikj6l5sIFnvMw6I=; b=heH7gS6famKwe5vUd/COmOEB2FPFsQbBo5SDSeCYchwmD3/Br0TBPeukJbpCjM98dnOI+6 3HSEST9gbLNk/DrGk9V1g+uldvIDhSs9trjRtbT4GXyBSoMjyfnt5DC2jQOF4olJHIVyn8 0SD5ceYpEocQMmF2YeImqF8OsPkBZm+x1zcMWFcy4+Y6IJFey8GMXYbqquSB6IK7rldGre Hsb7lc/9+ZwMgXeHFxQtR17WEzRi1GnIBPTsUBwb32KVAx4WuIxCNbGzcA/LbA5VExpzM1 lGMgAM1Wmpq7+nCp/sFJeGsX66y0AG33Xtouj8e+HyFdNlMMlFBwZFZXXQzgaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762229514; a=rsa-sha256; cv=none; b=Eh6Zn2+lqVKNuYzCClKhSdI5Pg8rjVm/VFjNrC7vu/YlwA07CF2oqI8sRJmi5sY64gGQZH B0uAPVeTEyCw+rUjgqUuKNOG4ytqtNZdWHBsjS3pbxQTb6hFk59Y4Br3VVrVtaEHYt1I8y PJa67tDhH2b+6RxJJTQkcDemflMabBTmum4OmUnLy5jc9kJcu+qG0Mia3bDFpp6t8oyxaD MdHobAJOQ5BfgFH4Frhl01WJPd+sNU47YHoeib5L126gAOTdO/8Wu4O2qm1d1mCCYByKi3 Jb94/LHAi5KXdAQ4sCmGNv0xdbWnM2Qtq7CJtv3mbEBzZcsLQHz3OFzxPiwmZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d0w561d9mzj8v; Tue, 04 Nov 2025 04:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A44Bso1034532; Tue, 4 Nov 2025 04:11:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A44Bscv034529; Tue, 4 Nov 2025 04:11:54 GMT (envelope-from git) Date: Tue, 4 Nov 2025 04:11:54 GMT Message-Id: <202511040411.5A44Bscv034529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 58e5f3b84df0 - main - sys/: rename bio_error variable to abio_error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58e5f3b84df0aeaaf4b56a5e48bcb4b3e1d9c097 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=58e5f3b84df0aeaaf4b56a5e48bcb4b3e1d9c097 commit 58e5f3b84df0aeaaf4b56a5e48bcb4b3e1d9c097 Author: Konstantin Belousov AuthorDate: 2025-10-25 08:37:14 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-04 04:11:11 +0000 sys/: rename bio_error variable to abio_error to prevent future name collision with some buf/bio macros Reviewed by: mckusick Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D53351 --- sys/dev/mmc/mmcsd.c | 8 ++++---- sys/dev/nvme/nvme_ns.c | 14 +++++++------- sys/kern/vfs_aio.c | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sys/dev/mmc/mmcsd.c b/sys/dev/mmc/mmcsd.c index 5b9cb93c7b31..f2965048b285 100644 --- a/sys/dev/mmc/mmcsd.c +++ b/sys/dev/mmc/mmcsd.c @@ -1422,7 +1422,7 @@ mmcsd_task(void *arg) struct mmcsd_softc *sc; struct bio *bp; device_t dev, mmcbus; - int bio_error, err, sz; + int abio_error, err, sz; part = arg; sc = part->sc; @@ -1430,7 +1430,7 @@ mmcsd_task(void *arg) mmcbus = sc->mmcbus; while (1) { - bio_error = 0; + abio_error = 0; MMCSD_DISK_LOCK(part); do { if (part->running == 0) @@ -1475,11 +1475,11 @@ mmcsd_task(void *arg) } else if (bp->bio_cmd == BIO_DELETE) block = mmcsd_delete(part, bp); else - bio_error = EOPNOTSUPP; + abio_error = EOPNOTSUPP; release: MMCBUS_RELEASE_BUS(mmcbus, dev); if (block < end) { - bp->bio_error = (bio_error == 0) ? EIO : bio_error; + bp->bio_error = (abio_error == 0) ? EIO : abio_error; bp->bio_resid = (end - block) * sz; bp->bio_flags |= BIO_ERROR; } else diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index f4a588373c98..17684cc14ba2 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -45,7 +45,7 @@ #include "nvme_private.h" #include "nvme_linux.h" -static void nvme_bio_child_inbed(struct bio *parent, int bio_error); +static void nvme_bio_child_inbed(struct bio *parent, int abio_error); static void nvme_bio_child_done(void *arg, const struct nvme_completion *cpl); static uint32_t nvme_get_num_segments(uint64_t addr, uint64_t size, @@ -275,14 +275,14 @@ nvme_ns_bio_done(void *arg, const struct nvme_completion *status) } static void -nvme_bio_child_inbed(struct bio *parent, int bio_error) +nvme_bio_child_inbed(struct bio *parent, int abio_error) { struct nvme_completion parent_cpl; int children, inbed; - if (bio_error != 0) { + if (abio_error != 0) { parent->bio_flags |= BIO_ERROR; - parent->bio_error = bio_error; + parent->bio_error = abio_error; } /* @@ -309,12 +309,12 @@ nvme_bio_child_done(void *arg, const struct nvme_completion *cpl) { struct bio *child = arg; struct bio *parent; - int bio_error; + int abio_error; parent = child->bio_parent; g_destroy_bio(child); - bio_error = nvme_completion_is_error(cpl) ? EIO : 0; - nvme_bio_child_inbed(parent, bio_error); + abio_error = nvme_completion_is_error(cpl) ? EIO : 0; + nvme_bio_child_inbed(parent, abio_error); } static uint32_t diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 60916a9fbd32..02d4b8426757 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -2487,7 +2487,7 @@ aio_biowakeup(struct bio *bp) long bcount = bp->bio_bcount; long resid = bp->bio_resid; int opcode, nblks; - int bio_error = bp->bio_error; + int abio_error = bp->bio_error; uint16_t flags = bp->bio_flags; opcode = job->uaiocb.aio_lio_opcode; @@ -2503,16 +2503,16 @@ aio_biowakeup(struct bio *bp) * error of whichever failed bio completed last. */ if (flags & BIO_ERROR) - atomic_store_int(&job->error, bio_error); + atomic_store_int(&job->error, abio_error); if (opcode & LIO_WRITE) atomic_add_int(&job->outblock, nblks); else atomic_add_int(&job->inblock, nblks); if (refcount_release(&job->nbio)) { - bio_error = atomic_load_int(&job->error); - if (bio_error != 0) - aio_complete(job, -1, bio_error); + abio_error = atomic_load_int(&job->error); + if (abio_error != 0) + aio_complete(job, -1, abio_error); else aio_complete(job, atomic_load_long(&job->nbytes), 0); }