From nobody Mon Dec 1 03:48:21 2025 X-Original-To: dev-commits-src-branches@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 4dKVHZ4rjMz6HtJv for ; Mon, 01 Dec 2025 03:48:26 +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 4dKVHZ20pkz3mNR for ; Mon, 01 Dec 2025 03:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764560906; 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=vZzcxV3BbOiNW8Br3Irxkkt41hy+CoZFFsMtLZKHOzI=; b=HGgp61fDycTfsOIZEV/1cQrJ03ishURhTz/xFVM9Q3ZgyvtxYXqRcrnJZW72pZU89IsTuL LZGrfBwmB0UYcro1LIpjZgSHGKp9orzO0gCLXi303g/Weo9vOyIPCdEGVxkNmQobk9sofy b1yZkJp+Xcmjd2EtFJ7Hb0eaqw0iQHp8f/eN1hzcuBbheOmu6yMkjVSOROPWysoLUq4YM7 nccUxnTpewFY1hlDOlXmiDq7Kw12XfQndfoNRV1nG4ewfob0VR/Hij6FKs8d/TonMCGgUI ZKKGg2K8XWBnr6kIGgnygXf+nppQHtxcGcg8ZMlc/kR+rg2lbFYl26eFj74ZdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764560906; 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=vZzcxV3BbOiNW8Br3Irxkkt41hy+CoZFFsMtLZKHOzI=; b=TnWCwjAGyhaxPiQK/+I8Hi+sVm4nHZ8Lc3UwKCrL2XQ2FeDNqOg8QkEcSntGeufHGFVovH zmHABu2HjFo//fi9RD2i/+Tzvv6lv14SGk898kn2NrtTrMflW/ty1roeEvDT1f4h0/0rsB vzmTCLvpmYe0Ot3/ERtMSBa3urD6MHH9YzMcP5pYI9B9V8ZlTlyAKMhd5u/8S/fMJOefPs Pe5YkZ689S19DlFqMBuBbBdfwC/si0G+HORpKh/IhHotE2fOHQZJZKyWvy3ooPB65X7ddw 0dOA/TkHlcsiZskUbnXbmLJeEd4noSWOcEZdoXWlQGaMLnm6FcZQHLY5rVrrnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764560906; a=rsa-sha256; cv=none; b=Fl8NTvQXEGEvQ4BN9+Q8BfzFVpx9i74AM0Gk7yfuQvZwZhODirquVoTPLnIJ4tGKsD2Hgs ERfI8nQSHcKQqGLqh8aFauIIQVzfOvhS27daMdpFqg8PDYF8ygROnTcaJOrPdwnyPHpfN5 1IQMRON2H+Cb42RzZ7RNEJADAIr39qjGAwwlyAfNFg+sBHVdEz1yNTJEpYFsu8JiunfbQR cpQpiqPz4Jin82Qws1aPPCZinEgYgdTdSiFtdbkw3A4BvxDuTV6tBIqgkykVNZoulT11KP W81opMcU5Ke7VRzAUwSDNtFwksPtlg7VOokm7/XyYfroT8gOqqRMDIF7psLDWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dKVHZ1S8hz14LZ for ; Mon, 01 Dec 2025 03:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2eef4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 01 Dec 2025 03:48:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: cdf37c58727f - stable/15 - sys/: rename bio_error variable to abio_error List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: cdf37c58727fa3d32de9300233d7295abf63ddde Auto-Submitted: auto-generated Date: Mon, 01 Dec 2025 03:48:21 +0000 Message-Id: <692d1005.2eef4.90bbb58@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cdf37c58727fa3d32de9300233d7295abf63ddde commit cdf37c58727fa3d32de9300233d7295abf63ddde Author: Konstantin Belousov AuthorDate: 2025-10-25 08:37:14 +0000 Commit: Konstantin Belousov CommitDate: 2025-12-01 03:39:09 +0000 sys/: rename bio_error variable to abio_error (cherry picked from commit 58e5f3b84df0aeaaf4b56a5e48bcb4b3e1d9c097) --- 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 17f6c205752b..f50b8993a362 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, @@ -279,14 +279,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; } /* @@ -313,12 +313,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 65d7ffc9b742..2a790237d30e 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); }