From nobody Thu May 28 17:22:56 2026 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 4gRCxF25nHz6g3Fj for ; Thu, 28 May 2026 17:22:57 +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 4gRCxF01ptz42fQ for ; Thu, 28 May 2026 17:22:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779988977; 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=qJIHD9YKRw8/KHybEnOUyB8OPSgccTjNXUIGHDr0SSQ=; b=hG3isge4NZUXUZ9nowKPQ//HHZQ1ZR+2Spcl57S+ppf21ASlQVm3dYkqgzTSo1WT/HnizO QZySMoNDiA3e7abNSPpSeMSgTM2tUZZY73kS5+Ybre+zkn6egnHyi0r3Cd5o3eInXxSgoS h+RMkVOYbyn6IYLbKuA1VLqprLKuH7PTydo4WMv5iielk/gpeWxkfpr/4T4pISAkckiTGU GEWL/dPDZpO3F5yEulachmGywdQnwzpRIHLS+9hd7D+PmII0it4lCkNKIQpy+EmYOgtJj0 hHZQyaVRwBuVE+1+WBs5OAIVrEuYkjVdok7uiv6f5WindCGndnR4pliBUMSyVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779988977; a=rsa-sha256; cv=none; b=dVs5K3RGYNSNfFiPHOmrBl1Uduxyj+Ta4kiShWLyd2fAaYGfnoeJOTCX9Wi6RUDe5TWR8K 0k/u0H/tMIMXCYYQc+oNoBSyG1ucBWeCOG0uapZ+G2EwgNzi8K5gDB3/6d148U0OqIXAWI ny6JjnZDhMnYKO9vTYxS9J1ju0VRC1IENXmurMEB4aYGwRrGFTyE8c/bM/DK5qos72SQK7 SY2NDOYuQIciht/lIgo8mnZV7Vi3h87wX7jlSOijd9xUnFzj3E1cdKw9lBtp4QHU4UNmU0 Jg08pbzqJcDoHGPTPIEwCF7GClh+ramaGr5sHsAbFs9kjtdiPzLNdfjLvkt06g== 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=1779988977; 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=qJIHD9YKRw8/KHybEnOUyB8OPSgccTjNXUIGHDr0SSQ=; b=ZqosqRLP2t3c1cnC6BHyzcHzJCgC4NnKumsfoGrHR4MH3fC4TXM7+h8Tplx9fJIQHwkM/0 2XbH5ZWJ3DBf7rNqCnx/8qbbfcHQ7aIHQxwATcnW8F3wXWji6n6cLQGgsdm6L5+6F/cndf fkoirdDE1eL4BSdGnnYrFuIvHCarD5ZQODnGD9tnOOuQ++G3ogipWL2qThZIVOC56Nw0yM 9rgC0IbcXxAaXXBLFP1FGj5zphMJSiwHTHWp86WsN2TYhnHWAVsJv0zOW8SXMPfDGiJiDg xgdX7QZ8zJpCb/2aZfIuZ8vhwYIquiVpNHcKW6MivtAJE0AsiS1yOunezXp31g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRCxD5xVKzvrr for ; Thu, 28 May 2026 17:22:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d304 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 28 May 2026 17:22:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 95fc64cc29fb - main - ctld: More consistent error messages 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 95fc64cc29fb4cddc7cad093cfa32587a623f560 Auto-Submitted: auto-generated Date: Thu, 28 May 2026 17:22:56 +0000 Message-Id: <6a1879f0.3d304.650514e4@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=95fc64cc29fb4cddc7cad093cfa32587a623f560 commit 95fc64cc29fb4cddc7cad093cfa32587a623f560 Author: Dag-Erling Smørgrav AuthorDate: 2026-05-28 17:22:43 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-28 17:22:43 +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 --- 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 8c5c447f3e80..ef7ef87af090 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"); @@ -498,8 +498,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; } @@ -570,7 +570,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; }