From nobody Thu Jan 18 22:43:45 2024 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 4TGHpn6bdyz57BY7; Thu, 18 Jan 2024 22:43:45 +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 4TGHpn4wbVz4KG7; Thu, 18 Jan 2024 22:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705617825; 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=xgu/MXPZ/Bjx+vJAx7bRTz3SuCHC0/7h2xLCrpTtm1g=; b=M9JG6ad3iqwJmGLSg3KhgYqaKmQtEuMLqw9XeIsmkfQBwke+gJclZ94va8RaCLa+GtgzhH kT56jHfkxqzCAvujseRxlHk7PHAz4kAblRZ0ZOK4oqqWMbVszf86LHFTEWXIFd3vCJbbgq edjmVP/6gT7WzB3fOsA9zWWYtXz3MA3TIvJEBSS2tEqkUp8HUPgeIiW/xVsh2Rf1nu+Beg ZNdcf0myeyk3pCSiHpM1alqVMhZ9nWuPlbC4qIQSk3XMl5HThwcGZicfsd3ugxB4GaA0Q2 A3nJwfIHOkdkh1fPv8WQkheH7i7ncQm2t+98NWx7ANjcUDXk6gKycCnsG2nFLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705617825; 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=xgu/MXPZ/Bjx+vJAx7bRTz3SuCHC0/7h2xLCrpTtm1g=; b=b3hArxgrjD8KI8XnL2mPWp2ghJ6rEZAEO0yIwpBH3Fe5DHrcaIyUWIfvr2leI2NUbo2FRK w6l+cf6KIvRCy0NU+NmwxMn1gXssoYfRVXRyMhxYMc934zf5SwzAbjH1IXoOtmBZ+/nK1X OjRgidpwwpFuMWxtBvZEKt3ohOR1zT6wBssiEIFBgiGpvNRP5wjkovZ+KGwJiiew3Wqo3a 6U1er3BHbvAkkszbo1ofGh23zOOvQ1i9vr/Z/2xcsFlTzxMcoaOaCLYx9RWTp1r7UINg2D bi8m4VaYNfQ8FYty6Geyph8Hx9YcBzakvtA8VVbVI83tBEqVDpyxDnalcvLSeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705617825; a=rsa-sha256; cv=none; b=bQtEmwa9feuE1S5+LUS4uL9rHXfcNWFOk6assU7N/1zSSXjy5eK1vn4SjHRR77lxhqEWe/ 84zXwUsnhX+IDkYJ9fj8qWdplfMVdio4W+8yPeVPZ9KieoKfhRr3wbtFdagDbFRezgaSC0 S5SYONOG8GYpz/oJnPn2zpIeLkO5oWXARLyswS9eRaDyW0LAGcZ6CC8SKE92kLvMoZdtfV GwLedTmxRSEmeoUzljSEkTpFIp3BtRlMicmt5RiEDXyK/NLrIendYLEHGvgmjnFx4c5q4b snO7ho/9g5lKMDHL9NuRunP+7abPPdogoVVooDfwZTRHJ96UImpfYASZO03XeQ== 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 4TGHpn42Q5zQfN; Thu, 18 Jan 2024 22:43:45 +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 40IMhjKX025123; Thu, 18 Jan 2024 22:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IMhj7i025120; Thu, 18 Jan 2024 22:43:45 GMT (envelope-from git) Date: Thu, 18 Jan 2024 22:43:45 GMT Message-Id: <202401182243.40IMhj7i025120@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 49413aa308fc - stable/14 - ctladm: Only autoload cfiscsi.ko for iSCSI-specific commands 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 49413aa308fce38b25d70af33b156191b1d6753c Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=49413aa308fce38b25d70af33b156191b1d6753c commit 49413aa308fce38b25d70af33b156191b1d6753c Author: John Baldwin AuthorDate: 2023-12-27 18:11:19 +0000 Commit: John Baldwin CommitDate: 2024-01-18 22:41:43 +0000 ctladm: Only autoload cfiscsi.ko for iSCSI-specific commands Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42935 (cherry picked from commit 0f3210b3a7fac2cb247986dae4d68040222cdb33) --- 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 3ccf93d5e94e..e99610373ff0 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -4145,10 +4145,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)