From nobody Wed Dec 27 18:11:41 2023 X-Original-To: dev-commits-src-main@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 4T0fq21HFQz564Ct; Wed, 27 Dec 2023 18:11:42 +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 4T0fq16LHnz4FPS; Wed, 27 Dec 2023 18:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703700701; 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=iZnsUSYrBAyXo4/mwjphGEhE0xIetbd9gqcGr6EDRGw=; b=nLkSTwJRBbWQ0kpkaThyZBUCT+ndpESFndUgVcsAstb8zHwfpWAWU7OunEnJiM+03+5OM0 cgqwg8BxeXe8SfG1BAO8iuXtT9Q9J5ROtWt/qEl6DlXMJh7i6QrTet6ywrcjY76s6w7kRG tlWe2H5F8a4nQeuhrbQKx0vqdQHBKjppQfofhNzPrIdJKgDMiqaa8gwa83KhhWQtM3/v/B JGRGGYNHPBKmok8sJHg3Tcr+gAzkNnCVyaXYIlPrOE8JwtcnG0S7bOFsKfTvxwRjmpYmWx T8HI9vELtyqGGNCrpveAWZHCRbjF5peXgN0MNBtdBfdDQzH3a/hMVOnANz2Wcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703700701; a=rsa-sha256; cv=none; b=xcjDfjhUWTMb8fwg9YQIL1/DAZYyrQmw7d+75sPVyREiAFaBzciJXaxBTmtXne6pTekQT6 nTlE0SlDZXR3FBcYB0je2xTuDuUYakhHNvAyqCQCOIyhW6LjRAj4LdCjb+CLIS8cesWLvV fPsnFM1Xwz8UY47DPpmzL8rYVJ0iRI/IEAI8dR9bCuHcNcm8aHp/yqzRm03VORWOaNPdwH WZSaNy+2xaOvQosqA+Ad/RtJQhi7wfCTseaLwV4zvCPN1bPRZsECJQ/ms6DSFdMPfIbwsN ZvvVB1Z5n3IvUQEfBy19+8xPh4TooB4ZPq+6tN+WRn2f8etMXWXdPokYQNEYJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703700701; 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=iZnsUSYrBAyXo4/mwjphGEhE0xIetbd9gqcGr6EDRGw=; b=Q1zMM0bE10hKxLY2kHCJt3PFkIBuA0eFVvCypYWRWmVh17pwt6u0OwCuzSq2CZgYR/rUqc xEbR/HZUXu3LTv+bUYHGw67YpfRuBPwiQTW/tgqluceiybn/IxP2PrP1X0QgzRcT4g24Dz cCOanawAAlb0p3oTTH2IbJ8+zByf+HoGBa1LUW15e0wyevvd2jod8My4kq2YeHsJWrqOFH dRL9W76x8rl3ZXyb6qwECTUYdX0cUKORqsLY/a4ZDWUsR4qSyocDiwOsR1wWIKJPMwBxUy Z9wHMxH0wZbpEpJU4gglhDInNMJrnknIqOyCzfTPkF0QgkMNLiefI1hDNzqoRg== 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 4T0fq15DyyzpJH; Wed, 27 Dec 2023 18:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BRIBfpn049458; Wed, 27 Dec 2023 18:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRIBfEB049455; Wed, 27 Dec 2023 18:11:41 GMT (envelope-from git) Date: Wed, 27 Dec 2023 18:11:41 GMT Message-Id: <202312271811.3BRIBfEB049455@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0f3210b3a7fa - main - ctladm: Only autoload cfiscsi.ko for iSCSI-specific commands List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f3210b3a7fac2cb247986dae4d68040222cdb33 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0f3210b3a7fac2cb247986dae4d68040222cdb33 commit 0f3210b3a7fac2cb247986dae4d68040222cdb33 Author: John Baldwin AuthorDate: 2023-12-27 18:11:19 +0000 Commit: John Baldwin CommitDate: 2023-12-27 18:11:19 +0000 ctladm: Only autoload cfiscsi.ko for iSCSI-specific commands Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42935 --- usr.sbin/ctladm/ctladm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index 49938be9282a..9d2f14de28ed 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -4144,10 +4144,16 @@ main(int argc, char **argv) goto bailout; } #ifdef WANT_ISCSI - else { + switch (command) { + case CTLADM_CMD_ISLIST: + case CTLADM_CMD_ISLOGOUT: + case CTLADM_CMD_ISTERMINATE: if (modfind("cfiscsi") == -1 && kldload("cfiscsi") == -1) warn("couldn't load cfiscsi"); + break; + default: + break; } #endif } else if ((command != CTLADM_CMD_HELP)