From nobody Tue Jun 2 16:42:14 2026 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 4gVGny5lc0z6ft18 for ; Tue, 02 Jun 2026 16:42:14 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gVGny3nbhz3nGq for ; Tue, 02 Jun 2026 16:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780418534; 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=v27M5BX9LM3skNL/pSP7ItxzlphO1SDrExf87xT8m0w=; b=odohmjCShQzkniMgKpznoCxvlgDbvtEvP8sdV5oO5YhmE5eBGVfyktq5YPmNdhFVQb966E ALnldRg41HqsnqlQh2BhNLdENvGGObIPJ8cP3pQDgoWQoOMD0GbkE8Effxm3dzeS7TSR2l ApfaC+u0hCfIglNW3dG6AaMTO6j3Q4vzfhCg+U5St/8bZhtarxZ1KTWrr4FWHkSwoOpI+K 5sHqlz++tg420B1OOCQrv0+aDdFDk5++a/ufGiAOz+r/zCRl6LTG9+rkJqw1poqbO2582b MQ9T7mQgPFSxXS+7p0lcb8yncvqE/Ai8PAmwCPMdaBRxDQUbsNg300WLl6Jm2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780418534; a=rsa-sha256; cv=none; b=p+ZYYSEowFIejSHH2RL6Pr4gIREBuEOrTXvBSqAUh8Ue53YP7l78MZlHHEKh+Q76SNJTC0 tETXLFbqMH4EB9fP3TgwpLjBC1aqpfFoeRTtVey6sQHH/E4651z1vHBaqm0qlF7vZ7kLGS U5ZTuaTkxZUP5C/CStrDPmDgNs+d9YJs0Fi/XaniaTVxEEcEmYiW/vCfZJMOSX9X5m9f7Q 6RwdJ+OD3pMWMF0LgvjTclp2+qNprP+QDdevqjd215i17AOIscgn/9jMzycsBWiVNxQMic 1E+K6Q/9pqxCi16IBMnRGqQXWa7r0Y878O3hnOUAlSM65m6cFohuws08WTQeSQ== 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=1780418534; 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=v27M5BX9LM3skNL/pSP7ItxzlphO1SDrExf87xT8m0w=; b=ozmwn4MORGSueQPu4TgVzX4W9oDIOaoEtPnYEChrX+twv/4G724RWuPAk8M+OkeOpo8lb4 Jvw/ePSFkkWkVWdjRW2FW306y8LhqbsnsBMuS0Rtuqbyd1guHzE9UngY0mSC57sf9dBO+2 GvKISVX0Cd3NkSVsNs4sFtkF+1BnCfrEKQLw+8bHQJTjsMmst/g8IOmRDCSYAvJQz7g/ZJ c7WEFNH5k8mSLoqrdWFOUxhDS0Gv/WQ6x1y/fIpsKAYcTFAVEsx52G0LqgszMvmzyGlD0k BrotfAVWbeYqpcV7924PAa+H4TUXOlMgoOoSYjtgxQ6pEm+MSJ6goVNj+gh/PA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gVGny1kLPzYxC for ; Tue, 02 Jun 2026 16:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 451bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 02 Jun 2026 16:42:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 689206379f4c - stable/15 - ctld: More consistent error messages 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 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 689206379f4c419d6340a8dde402f63a236e111b Auto-Submitted: auto-generated Date: Tue, 02 Jun 2026 16:42:14 +0000 Message-Id: <6a1f07e6.451bf.63e937e1@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=689206379f4c419d6340a8dde402f63a236e111b commit 689206379f4c419d6340a8dde402f63a236e111b Author: Dag-Erling Smørgrav AuthorDate: 2026-05-28 17:22:43 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-06-02 16:41:38 +0000 ctld: More consistent error messages The error messages ctld emits when it finds a port or LUN it did not create were inconsistent with each other as well as with ctld's other error messages. MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D57270 (cherry picked from commit 95fc64cc29fb4cddc7cad093cfa32587a623f560) --- usr.sbin/ctld/kernel.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.sbin/ctld/kernel.cc b/usr.sbin/ctld/kernel.cc index 6b17ce60ac69..f2bdf53bd3ee 100644 --- a/usr.sbin/ctld/kernel.cc +++ b/usr.sbin/ctld/kernel.cc @@ -446,8 +446,8 @@ add_iscsi_port(struct kports &kports, struct conf *conf, const struct cctl_port &port, std::string &name) { if (port.cfiscsi_target.empty()) { - log_debugx("CTL port %u \"%s\" wasn't managed by ctld; ", - port.port_id, name.c_str()); + log_debugx("CTL iSCSI port %u \"%s\" is not managed by ctld; " + "ignoring", port.port_id, name.c_str()); if (!kports.has_port(name)) { if (!kports.add_port(name, port.port_id)) { log_warnx("kports::add_port failed"); @@ -496,8 +496,8 @@ add_nvmf_port(struct conf *conf, const struct cctl_port &port, std::string &name) { if (port.nqn.empty() || port.ctld_transport_group_name.empty()) { - log_debugx("CTL port %u \"%s\" wasn't managed by ctld; ", - port.port_id, name.c_str()); + log_debugx("CTL NVMeoF port %u \"%s\" is not managed by ctld; " + "ignoring", port.port_id, name.c_str()); return; } @@ -563,7 +563,7 @@ conf_new_from_kernel(struct kports &kports) for (const auto &lun : devlist.lun_list) { if (lun.ctld_name.empty()) { - log_debugx("CTL lun %ju wasn't managed by ctld; " + log_debugx("CTL lun %ju is not managed by ctld; " "ignoring", (uintmax_t)lun.lun_id); continue; }