From nobody Sun May 01 22:54:15 2022 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 B28101ABBCEA; Sun, 1 May 2022 22:54:15 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ks1kH4d4qz4kL6; Sun, 1 May 2022 22:54:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651445655; 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=EYo8ww1ks1r7RTkj7TX5x2bwwggfo9jwVgVTkudzmNs=; b=D9V/hazkLDTJRvpYIUKpK/Fz016QFZQjrYEjGX+RiAfFjpVo2e0QMcBWz7RortGK95cvrV l2TyygLtGSYoy/k102eBfOkle1mt2ofSj+fZQ0rTQR5kvm/yJ1m6ztOGyfxECkw8sctinh +6GpyubI60Dq3LR/Vg4jMNDLBlgLCg5VsZf6qxc929jN97cqnNbxRDwFPlgM02Bsulix4Z z/cK9u/cBUcHsRSmhvYTlB0z7U442wXYjO/q0vXeN3NaOJbujQXwrxH5kwNvEQcGuuQgvT Q3PlNPqeyTBbkfhabFLZYrSGA9sBsuVh7GStC+GG5cAx7qIPPz6m7+ajgYxcZg== 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 7ED0B1E89D; Sun, 1 May 2022 22:54:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 241MsFHt008614; Sun, 1 May 2022 22:54:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 241MsFqH008613; Sun, 1 May 2022 22:54:15 GMT (envelope-from git) Date: Sun, 1 May 2022 22:54:15 GMT Message-Id: <202205012254.241MsFqH008613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1599fc904d35 - main - iosched: Move bio_next() inside of the CAM_IOSCHED_DYNAMIC ifdef 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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: 1599fc904d35cfa8eecad92818d1f4b55de6818f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651445655; 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=EYo8ww1ks1r7RTkj7TX5x2bwwggfo9jwVgVTkudzmNs=; b=mt/P5QZ5qOxLpVim/pEO/REYY1iglj4mzhvWumcq6mTOJ6LqZSCAYl+7Xdk2MvtPt8fhus 9yCHPlSqG4MOJka7+yP5VNK04ul2WEm1l22Sm84Rx5FPUINAQXvbeXDrr/c0gpbBG9v06n dNm/VFVLT+oHf5+NEnkURoReB9+HANcgyPk+/+gSyckwR1HgsRWLwqvAvG7LTw2E7HSuOU hLUgWCqF/P3tJfbcgRzFhtBoAt4qd0sWhVpoV9tIs90GvV7sBmCGZsmhOUVg0iR5Zln+2r bLlfAbFlQNeMpGnBJkbDgPK05FvplREHMW77d2x95PLztBNobuBf7vLVUEHK5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651445655; a=rsa-sha256; cv=none; b=ufS/FBhpd8q5PXATGpB5HtHjKDEycWT9EWZNeIeHbdpNSIttxTCoUOs/IRyvJ6utEL4zeS YD8uPkKt0bpBc004HyqrPNKQhaJU8V9Mw4jv379iuWf+PpTTDbFer08Bfm1jbHk0fV8trh Td57z3QC1z8xRpnu3ju94mHAsxMqzmNsgh3KETSNCHNa9lVelh5RRcTj+iE6kVIyrLeKcZ +b2GeiZA27PZK+4tssSQq57HBLlf+l5v4eVKkQf2FfbmNhfV4XulGNXsgmx/z43J9MThE4 ZtntOs/cDAvalxuuj+qRcceclkwJ2b+AIRrpeEkSxYXhaN5bDSBbfhI8wWk0Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1599fc904d35cfa8eecad92818d1f4b55de6818f commit 1599fc904d35cfa8eecad92818d1f4b55de6818f Author: Warner Losh AuthorDate: 2022-05-01 22:53:13 +0000 Commit: Warner Losh CommitDate: 2022-05-01 22:54:15 +0000 iosched: Move bio_next() inside of the CAM_IOSCHED_DYNAMIC ifdef bio_next() is only used by the dynamic scheduler, so move it under that ifdef. Sponsored by: Netflix --- sys/cam/cam_iosched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cam/cam_iosched.c b/sys/cam/cam_iosched.c index c1e11419856b..89e8a2f58212 100644 --- a/sys/cam/cam_iosched.c +++ b/sys/cam/cam_iosched.c @@ -1505,6 +1505,7 @@ cam_iosched_get_trim(struct cam_iosched_softc *isc) } +#ifdef CAM_IOSCHED_DYNAMIC static struct bio * bio_next(struct bio *bp) { @@ -1518,7 +1519,6 @@ bio_next(struct bio *bp) return bp; } -#ifdef CAM_IOSCHED_DYNAMIC static bool cam_iosched_rate_limited(struct iop_stats *ios) {