From nobody Fri Jun 6 20:25:14 2025 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 4bDXqt5HrGz5xxXB; Fri, 06 Jun 2025 20:25: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bDXqt4ShLz45qW; Fri, 06 Jun 2025 20:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749241514; 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=Juj0op6Dq4dCNxrhjJkKaByxI/9Ys5UgnTcG6SSGUw8=; b=Zo2tQeShaIMz/hY6Aunt45CS/VqAsLByVoj6hEzn7RQR7OsSXOBNfKo+xQiwT8RYTDJuIv rgVl/EGVtTNTEfBp86FoHnaI8XxS5QKmzsULHsqVbtuOfLOC8aaOKEeUT6M9uEpeVmDsWq xz9xLrJ6RbhEy01HBsj1pbRQsHCdkkFtmvyvw9rwZ6OCB6Jb7TOnyCgbwIsiy36MJTWhQi SP4T2dj9HJu0g/ny3j4rx48pPZoT3y3F6cHWc/KXIxvhVB6LsoBuVpJmBNgRvCZHSYDiGY GAABBgvWx8btAZa/D5Ql4RvxTFZ8lXYiRJ5QbYmDO8BGA3ZBIbfXP3DhkGH0lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749241514; 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=Juj0op6Dq4dCNxrhjJkKaByxI/9Ys5UgnTcG6SSGUw8=; b=HmRlLu8CG0RAnnFUrT29u8YBoJW1Hpv6yf4SsYZ1HQ4pj+26lH6eyW/JbQxfVWBER7pZTh vfBE5cc0iSRnsSwqJd+AttodudMNaSdaMgREM3ZOelxlNG1SdlbmwYlm0PoFDVynLS+Gxg LgnvWQ91paMQC9QcVs2t9l2MaZR5h4sRxSQwCMx6wEknMhxAe89hHE4QRqkUEFUJQOtRPK EjqEmj8ZBIHiiwFHjMC3CD8KDcoxrSTPIrxsTtl2mY7YKBhaq0c1vVZ5NoTmpEi4Cq6aEl +wUORGPPLJk3Pm9L5AqmgBeqftIziSaN/8eWGe+a0Bx0yE8Khwp1DVGeV+tiKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749241514; a=rsa-sha256; cv=none; b=ux6rmEJUx6B9aV8Gg241P6yG5dV2xcZRH/M9VsbE8/nsFSpTlvSOTZf8Qbo4qt+cA5Yza1 0fz80QegBsAxDKV8ato9oTrhuF57+RyBGzEtzvfnuFdqMRnHuFNpRFfVj/G2ZdLvq+z61c 4eFc4bT6wi3BWYfemCWgNf73fhGiVIK773HOUrZt5VAOWJxvboaWcwsGSwCXik92sD2Pz6 9YAMk7gElgaXgu24R/mwyp+WDGICMep4b/HmveQ8RwqvjDgQDLyKk8fZFTd4FLU5FZ28Gi jgcU/FaSlVC1n9CmgFDsz96DjMKij7GRZ8Q4JlqMzhJoKmXyKMasY5vE2yrqhg== 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 4bDXqt3fWrz18PW; Fri, 06 Jun 2025 20:25:14 +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 556KPEcp017941; Fri, 6 Jun 2025 20:25:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 556KPENC017937; Fri, 6 Jun 2025 20:25:14 GMT (envelope-from git) Date: Fri, 6 Jun 2025 20:25:14 GMT Message-Id: <202506062025.556KPENC017937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 7908b5df1abd - main - pctrie_lookup_node: assume parent_out != NULL 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7908b5df1abdb3cf9aac0560401a718bff3e304a Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=7908b5df1abdb3cf9aac0560401a718bff3e304a commit 7908b5df1abdb3cf9aac0560401a718bff3e304a Author: Doug Moore AuthorDate: 2025-06-06 20:24:01 +0000 Commit: Doug Moore CommitDate: 2025-06-06 20:24:01 +0000 pctrie_lookup_node: assume parent_out != NULL Since NULL is never passed as the parent_out parameter to _pctrie_lookup_node, stop making the assignment to *parent_out check parent_out for NULL first. Reported by: alc Reviewed by: alc Differential Revision: https://reviews.freebsd.org/D50729 --- sys/kern/subr_pctrie.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index 676e3595316a..cb813cfbd847 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -514,8 +514,7 @@ _pctrie_lookup_node(struct pctrie *ptree, struct pctrie_node *node, parent = node; node = pctrie_node_load(&node->pn_child[slot], smr, access); } - if (parent_out != NULL) - *parent_out = parent; + *parent_out = parent; return (node); }