aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2026-05-28 17:22:43 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2026-05-28 17:22:43 +0000
commit95fc64cc29fb4cddc7cad093cfa32587a623f560 (patch)
tree84d37dbc0920e2856e242ccf9abf4b7426595fa8
parenta7df326619ef9caa2ed00bf2d103dd278e7b32ec (diff)
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
-rw-r--r--usr.sbin/ctld/kernel.cc10
1 files 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;
}