From nobody Thu Aug 7 21:11:48 2025 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 4byfx21DGqz63Vy6; Thu, 07 Aug 2025 21:11:50 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4byfx04WKwz4702; Thu, 07 Aug 2025 21:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754601108; 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=HcrKvpv4n71ysk3SPHFoXwdeYQmGqlQ+AuYR0DAyDzM=; b=pdEctlKTcbPntHTWiglSYwkfJyxdTcXTLo0d2YDLFXWo3Ta3YXYx0bAwn+92Mu/8BW+8iY K0iz+lqu/MhUqQ0a/hPVlPAFp6PWDXUJ809oyr+m9RvPQD8bnTbZ6Ttr60G/JACNfgokmJ fljIKI5yKnjG+VBfNYuvB10awEZPZ0eXIHkkM0AVebsdghq341FFeqBjuBw4Fn033q5eD7 tJmoltGtM3zItu74mgLqOABT81FjQ8+E6zn/uRm/HEq2Ot1AmWyRJhtHMgqbuHI9VOxeiX wUsstFeoStHguMZcxndNfqgbwiKqw1aVGz2U6AqOpoAqHTwB4a8yILFV9kOf2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754601108; 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=HcrKvpv4n71ysk3SPHFoXwdeYQmGqlQ+AuYR0DAyDzM=; b=YVOkfT4N/Hg5k0nWCsSL27ecT/qEVfTCMUQk0WGin68WHYrPej+bBBUVEU8+jB3WaaKvCP CDGbffzAOe/Mh7bKaPC3IjQmHNADqHv3Weh7hfTRiKKO0qlMJUcwtloAm+hyNQiqYAvXDV aHcOh5EbJlKJYmE4RvpwpiKFpjqg4RbOPYlCDPz+SOf5VEMEyBx9HynMh1RLPWDBDpdiwT AjfsyJvDBU+iLHaPvNwYwIOFsllFLpt7vAVAA9V+YF5QQhKOyK3hz3bQMwVS9JbV6NAOL8 NwRKxmykKEnxrAE2O8cZj9F4C+rTIc8CZ2hb+atsMjtCX7GUBXcD0OfrpRKD2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754601108; a=rsa-sha256; cv=none; b=wYQvnpls5OycclIn/1uiisFS7Q0qSOYEOWnUuUgdOo5A6/lW8Cluq5BJTHxIE591X+fwXB j91KXLxrO533uIXX7mTX6GWJpDNO0oCM2KUkLpnWkoCdXzLqbvQD51Ey/JkP9Ffq7BkN30 xYd1fvJ3VO26Ok6ZbGzLcz3hEr5QxdC/Kksypty5JmeVcymYpoZ7PFyohb2ko4dLE2LzBv vyyciESEjAttdLOxzl3HHhYkbZr1+Bljvf6wgEWBtLo1ls6ci5CcbKDutxVDEa2SmhI/rY tZP345pJZHgGi2QnPW0RpqCzkbtsNg3zhf5QstNsPUGOXkJkYZdKwkQfxqsuSg== 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 4byfx045Mnz1MK3; Thu, 07 Aug 2025 21:11:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 577LBmcL094811; Thu, 7 Aug 2025 21:11:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 577LBmoj094808; Thu, 7 Aug 2025 21:11:48 GMT (envelope-from git) Date: Thu, 7 Aug 2025 21:11:48 GMT Message-Id: <202508072111.577LBmoj094808@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: d21b513988b7 - main - ctld: Be more explicit in a few uses of types to avoid potential ambiguity 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: d21b513988b7d685edf2ad77886b3e3c95cc0df8 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d21b513988b7d685edf2ad77886b3e3c95cc0df8 commit d21b513988b7d685edf2ad77886b3e3c95cc0df8 Author: John Baldwin AuthorDate: 2025-08-07 21:11:31 +0000 Commit: John Baldwin CommitDate: 2025-08-07 21:11:31 +0000 ctld: Be more explicit in a few uses of types to avoid potential ambiguity This appeases -Wchanges-meaning warnings from GCC. Sponsored by: Chelsio Communications --- usr.sbin/ctld/ctld.hh | 4 ++-- usr.sbin/ctld/kernel.cc | 6 +++--- usr.sbin/ctld/nvmf_discovery.cc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.sbin/ctld/ctld.hh b/usr.sbin/ctld/ctld.hh index a5aab65e339b..bfe4507bb3e6 100644 --- a/usr.sbin/ctld/ctld.hh +++ b/usr.sbin/ctld/ctld.hh @@ -157,7 +157,7 @@ struct portal { virtual void handle_connection(freebsd::fd_up fd, const char *host, const struct sockaddr *client_sa) = 0; - portal_group *portal_group() const { return p_portal_group; } + struct portal_group *portal_group() const { return p_portal_group; } const char *listen() const { return p_listen.c_str(); } const addrinfo *ai() const { return p_ai.get(); } portal_protocol protocol() const { return p_protocol; } @@ -196,7 +196,7 @@ struct portal_group { bool is_redirecting() const { return !pg_redirection.empty(); } struct auth_group *discovery_auth_group() const { return pg_discovery_auth_group.get(); } - discovery_filter discovery_filter() const + enum discovery_filter discovery_filter() const { return pg_discovery_filter; } int dscp() const { return pg_dscp; } const char *offload() const { return pg_offload.c_str(); } diff --git a/usr.sbin/ctld/kernel.cc b/usr.sbin/ctld/kernel.cc index b214cd4e8c29..6b17ce60ac69 100644 --- a/usr.sbin/ctld/kernel.cc +++ b/usr.sbin/ctld/kernel.cc @@ -106,7 +106,7 @@ kernel_init(void) /* * Backend LUN information. */ -using attr_list = std::list>; +using attr_list_t = std::list>; struct cctl_lun { uint64_t lun_id; @@ -117,7 +117,7 @@ struct cctl_lun { std::string serial_number; std::string device_id; std::string ctld_name; - attr_list attr_list; + attr_list_t attr_list; }; struct cctl_port { @@ -133,7 +133,7 @@ struct cctl_port { uint16_t cfiscsi_portal_group_tag; std::string ctld_portal_group_name; std::string ctld_transport_group_name; - attr_list attr_list; + attr_list_t attr_list; }; struct cctl_devlist_data { diff --git a/usr.sbin/ctld/nvmf_discovery.cc b/usr.sbin/ctld/nvmf_discovery.cc index a32094ddafa1..839b69fdac14 100644 --- a/usr.sbin/ctld/nvmf_discovery.cc +++ b/usr.sbin/ctld/nvmf_discovery.cc @@ -62,7 +62,7 @@ private: struct nvme_controller_data cdata; - const discovery_log &discovery_log; + const struct discovery_log &discovery_log; freebsd::fd_up s; };