From nobody Sat Nov 22 23:54:23 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 4dDTTD0vm3z6Hpyn for ; Sat, 22 Nov 2025 23:54:24 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDTTC3lWKz3Gpm for ; Sat, 22 Nov 2025 23:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763855663; 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=Yxm59ObC/Vf8+FX/4xD7LRsSfce2KAM6LxdHPtkj2Gg=; b=NlZ1hdKmr51SibFfazPsjLxI/rsmBneEGIwNeYGXoFv2OWPerJ7RFBi0nTlvY/VTa38nPb Eipw/3zfrY0dq8VXyBqeY/o/r8jsNw18jKXf3EDdQ2bnvxWNbWu96bkJJ8vIaJRs3xHLO0 fFDzxkf942jQeG2IKqFsM34rVHR5RtuFz3So/ujKffnr+SL4dVd84PKevkLamTcVXgsJoT 9rpOeCI0mpBWJl8z1rpja6TDN66L6bkZn6g9WwSt4vSwdbgEwnJWsjI68jLQyFPxVBdE+D pCgszPHAYKady+0aAS1AXFBRpU4Gmidz9QB2dlW07cGee8PeKdxmVKZSpFWA3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763855663; 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=Yxm59ObC/Vf8+FX/4xD7LRsSfce2KAM6LxdHPtkj2Gg=; b=M9VionyFFBY3ch2j4XnOMolAVNAxayqYgQ3/+C+cVVGYgKhNDUEJ9TobXFSVcT2POSj4yE xeDRdEhPNy5ZZvUJTMMIN0WWsoth8AlmSFpGnQT4v6qk52Xy4t5gb7oDuyxWwWk/6BuXp3 n6/4W4GsGwM7qxSlN2BkrhcGw4I+ppJTV1IgsFaVwreytz2VaYWFrf9ik9atFJ7akHNjuy d2oBcijx4RTUSNvGmXKiNg9rCU1JuYMxA2bFbKdg3yseEF9FByT9AWq7W4BA9dV0QoS57b HQJFK8bh7hsLXnrAfXBWOaB8NMhBX4LPa/zxs1v0eErqvG4FueuNeCejQieVog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763855663; a=rsa-sha256; cv=none; b=dV2FZrRIJRGgaA+LNm3KyLk5+XrSsQcRwIWI+XyafoU8Ondoi893mCdHZ6XB7DSX1iVQ/1 WdJgu8w4ioG6icKiAf8d9bvzmMcnY7/c+VYSp05hSqPR5i6D+8i3YtqVJVQqgCYXd9qWqF xy8yvT7vSr+H255WS9hEuhSRJEbrDeZLSqMHVogiVWakgE9Aq5ziSKnlvNT4elL94CRFMv tMJEQXzcRieFwKgPu0ceP2hto3L2rwABc10Wng8YhLwmyUIxxAhHpCiSC+343zIb2PusaA SvV4PMRLnsbkNIQZ6HlW7YbzFnDIFhX81bqXYbP3bYQ+DDRWWuyc7MuW0z3tCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDTTC34GGz1Jp1 for ; Sat, 22 Nov 2025 23:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 222a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 23:54:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: a36c71acb6e9 - stable/15 - nfs_commonsubs.c: Get rid of variable used as a constant 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a36c71acb6e960c56516612fbf5e7fc1f269e845 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 23:54:23 +0000 Message-Id: <69224d2f.222a4.19f28453@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=a36c71acb6e960c56516612fbf5e7fc1f269e845 commit a36c71acb6e960c56516612fbf5e7fc1f269e845 Author: Rick Macklem AuthorDate: 2025-10-29 00:28:04 +0000 Commit: Rick Macklem CommitDate: 2025-11-22 23:53:01 +0000 nfs_commonsubs.c: Get rid of variable used as a constant The variable ncl_mbuf_mhlen is set to MHLEN and only used in one place. This patch simply deletes it and replaces it with MHLEN. This patch should not affect semantics. Spotted while fixing cases that could do large NFSM_DISSECT() sizes. (cherry picked from commit 73551cd6eac29a6707c802c7d7fafcb560bf5e2b) --- sys/fs/nfs/nfs_commonsubs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 8e1a26eef354..f580a394a735 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -194,7 +194,6 @@ struct nfsv4_opflag nfsv4_opflag[NFSV42_NOPS] = { { 0, 1, 1, 1, LK_EXCLUSIVE, 1, 1 }, /* Removexattr */ }; -static int ncl_mbuf_mhlen = MHLEN; struct nfsrv_lughash { struct mtx mtx; struct nfsuserhashhead lughead; @@ -770,7 +769,7 @@ nfsm_dissct(struct nfsrv_descript *nd, int siz, int how) nd->nd_dpos += siz; } else if (nd->nd_md->m_next == NULL) { return (retp); - } else if (siz > ncl_mbuf_mhlen) { + } else if (siz > MHLEN) { panic("nfs S too big"); } else { MGET(mp2, how, MT_DATA);