From nobody Tue Oct 06 22:58:48 2026 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 4hzsBQ4NTxz6cdrD for ; Tue, 06 Oct 2026 22:58: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hzsBQ1rRPz3DgX for ; Tue, 06 Oct 2026 22:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791327534; 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=hQdfHfGK5Axb+GJzID3rTbb9lgD3GjTp79iqmyE9JX0=; b=nt/D+3usAdpuvfxacJKpasZZssI1XWnLF5+9CkjV10XTCrpu2w9y+dRk7fbG6jv+GXwNJ2 vmH6O55rlDXUpn/IP8szvCPmk5X5hy/5fcEAQb+5PMDYFigKL1oEOSRI9hMDhmH19u0YXc jBVqHwaiduJTnmbn5EVlbYoZeX0iBv8Z6jUESj5su/uxH7QieRv2P0VZBpFX166K99SVPf iv2zy8hvWlVFIuUMyIXAzgwGHSmJ7K9vmuBYP69RvAIAcWmWmW3qJTNUtb0vVr36D5a+RE 0E1ee9zSITn8xtmR2tMl6eY4OaHDFfAJjwCCXbrHYjDVlKFptGWNS0FkcSOe9g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791327534; b=aDkn/7cvgA3K6/0T0MBBhlFzIzeyKfepwnAvOUCSbBkOZmMYARGiVtv09enIbiJmB3acoe CgOL1ADXyexMc4v9G5TII2DEez8kchU8bowRxOItjwqkgpq2sqNp+aPgtAcmMZbjHVnCbf hXaQSfayEJBOR4zg+XtA1VIQUYfuQire8HsKExgH1GCNd7w2UzX8jSUsd2SXKWo8T5TUgj vTszi6vOKq9naTXyVbBRdsBt/blZUfsHl5kxakU3rVrPstk6z/H7IxBAEvDjX3vknnIV7E Jj4Xqpa0rUiYJPLnrol/Zzj1PlMvQeeWpdOv+K+cN4/oLws3n7vNKcya5Gyr6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791327534; 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=hQdfHfGK5Axb+GJzID3rTbb9lgD3GjTp79iqmyE9JX0=; b=LO38v6MkzLmk9sMFCvO0rQ8LI1B7T+YwS+HsbmqoJLrAtTNEj3H4DTU127W2ErrwsZMy+L bUpJYN7PxoKcsCVVegZjRpiExXZRjdGUAIDdLHimDFXzUymcJryWdfPGrON5VxsNHvndoR yeNOB6SNx9mT5lDHbcWjDc8AkVmTvwXit1IWOjQQVb12YNe9IqzyaRnMXz89GeEZp70zKS WvBJcnr05GKTVBokqvipGu6ysRGVMFvG2IWXnEbjOVyuMSqINstneF7k74DsB2+PXccQG/ xsHuud4w2dkZJRqBJJTorpeBIAuNyTkP31dPW4t+H6U2ZBvH3rtSz6NmiW5g7g== 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 4hzsBQ0fLNzQf5 for ; Tue, 06 Oct 2026 22:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27b52 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 22:58:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0040d1fb7a25 - main - cam: Rename cam_iosched_bio_complete to cam_iosched_bio_update_stats 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0040d1fb7a251daa0690f4858ddb495bee79ae52 Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 22:58:48 +0000 Message-Id: <6ac57d28.27b52.68aa3ae@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0040d1fb7a251daa0690f4858ddb495bee79ae52 commit 0040d1fb7a251daa0690f4858ddb495bee79ae52 Author: Warner Losh AuthorDate: 2026-10-06 22:45:31 +0000 Commit: Warner Losh CommitDate: 2026-10-06 22:46:22 +0000 cam: Rename cam_iosched_bio_complete to cam_iosched_bio_update_stats The function updates scheduler statistics but does not complete the bio. Rename it to avoid implying ownership of bio completion. Sponsored by: Netflix Reviewed by: ali_mashtizadeh.com Differential Revision: https://reviews.freebsd.org/D60349 --- sys/cam/ata/ata_da.c | 2 +- sys/cam/cam_iosched.c | 2 +- sys/cam/cam_iosched.h | 2 +- sys/cam/nvme/nvme_da.c | 6 +++--- sys/cam/scsi/scsi_da.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index 76f8e26e43ae..9a088cc74337 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -3010,7 +3010,7 @@ adadone(struct cam_periph *periph, union ccb *done_ccb) * extensive. Release the periph refcount taken in adastart() * for each CCB. */ - cam_iosched_bio_complete(softc->cam_iosched, bp, done_ccb); + cam_iosched_bio_update_stats(softc->cam_iosched, bp, done_ccb); xpt_release_ccb(done_ccb); KASSERT(softc->refcount >= 1, ("adadone softc %p refcount %d", softc, softc->refcount)); softc->refcount--; diff --git a/sys/cam/cam_iosched.c b/sys/cam/cam_iosched.c index a7b7eb3cc4e9..e807301c6302 100644 --- a/sys/cam/cam_iosched.c +++ b/sys/cam/cam_iosched.c @@ -1771,7 +1771,7 @@ cam_iosched_trim_done(struct cam_iosched_softc *isc) * might use notes in the ccb for statistics. */ int -cam_iosched_bio_complete(struct cam_iosched_softc *isc, struct bio *bp, +cam_iosched_bio_update_stats(struct cam_iosched_softc *isc, struct bio *bp, union ccb *done_ccb) { int retval = 0; diff --git a/sys/cam/cam_iosched.h b/sys/cam/cam_iosched.h index 54f9a7c02a25..cbe6a20fb871 100644 --- a/sys/cam/cam_iosched.h +++ b/sys/cam/cam_iosched.h @@ -99,7 +99,7 @@ int cam_iosched_has_work_flags(struct cam_iosched_softc *isc, uint32_t flags); void cam_iosched_set_work_flags(struct cam_iosched_softc *isc, uint32_t flags); void cam_iosched_clr_work_flags(struct cam_iosched_softc *isc, uint32_t flags); void cam_iosched_trim_done(struct cam_iosched_softc *isc); -int cam_iosched_bio_complete(struct cam_iosched_softc *isc, struct bio *bp, union ccb *done_ccb); +int cam_iosched_bio_update_stats(struct cam_iosched_softc *isc, struct bio *bp, union ccb *done_ccb); void cam_iosched_set_latfcn(struct cam_iosched_softc *isc, cam_iosched_latfcn_t, void *); void cam_iosched_set_trim_goal(struct cam_iosched_softc *isc, int goal); void cam_iosched_set_trim_ticks(struct cam_iosched_softc *isc, int ticks); diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index e1831331f8f3..fe5c87c5428a 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -1322,7 +1322,7 @@ ndadone(struct cam_periph *periph, union ccb *done_ccb) * routine, which in the case of sendfile can be quite * extensive. */ - cam_iosched_bio_complete(softc->cam_iosched, bp, done_ccb); + cam_iosched_bio_update_stats(softc->cam_iosched, bp, done_ccb); xpt_release_ccb(done_ccb); ndaschedule(periph); cam_periph_unlock(periph); @@ -1349,7 +1349,7 @@ ndadone(struct cam_periph *periph, union ccb *done_ccb) * so we can keep proper counts. */ bp1 = TAILQ_FIRST(&queue); - cam_iosched_bio_complete(softc->cam_iosched, bp1, done_ccb); + cam_iosched_bio_update_stats(softc->cam_iosched, bp1, done_ccb); xpt_release_ccb(done_ccb); softc->outstanding_cmds--; ndaschedule(periph); @@ -1363,7 +1363,7 @@ ndadone(struct cam_periph *periph, union ccb *done_ccb) } else bp2->bio_resid = 0; if (bp1 != bp2) - cam_iosched_bio_complete(softc->cam_iosched, bp2, NULL); + cam_iosched_bio_update_stats(softc->cam_iosched, bp2, NULL); biodone(bp2); } } diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 9a52ee96fa80..04f924c7a91e 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -4788,7 +4788,7 @@ dadone(struct cam_periph *periph, union ccb *done_ccb) * the case of sendfile can be quite extensive. Release the periph * refcount taken in dastart() for each CCB. */ - cam_iosched_bio_complete(softc->cam_iosched, bp, done_ccb); + cam_iosched_bio_update_stats(softc->cam_iosched, bp, done_ccb); xpt_release_ccb(done_ccb); KASSERT(softc->refcount >= 1, ("dadone softc %p refcount %d", softc, softc->refcount)); softc->refcount--;