From nobody Mon Sep 14 23:57:28 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 4hkMXF5fbWz6sBtR for ; Mon, 14 Sep 2026 23:57:33 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hkMXF4DFpz3Nf4 for ; Mon, 14 Sep 2026 23:57:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789430253; 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=LmPvyjykoxHjwLyIRV5ngwN0A+aj76DqbsYNPwa+7gQ=; b=tmdCsoRYAfDWdw0RxrXfTM3a6Dh4A4p9+rs8wb2zOUeu/22ZnlZDwxW0JvJCtGfUl5XKNh DGsR6uXj3BdArzmKh14zE2TPNFu21YHUGR/nwXw8sbOBPDO4lXnXMix8AAdYQihZNKXjU0 oWx8Fttydp91vgqjX/iWie6LAJut9G1mM1hZMH7I0fHXb1aLOeOFQ/du6DUgWertIR4ymm QNWXvtmwDRIe+7Qb4uk2KhIRihl0+saFZcjZR+bw91dMeweFTqjDkBR2xuqkTcc6048K45 64amvg2UChlI83zl2i7CsUtrKxkBmnR/bQ61/VtkF+/bD0hSffEp/4gKJzIimg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789430253; b=s9Z7YE0ELMZ6ZSKumdRtW/9d4oqspBJrvbnc9qSFZX2a6aAZ+/h7/UMxuUCQ8NcdEGzsLc k2ckZLSpRF6x67aL8g4rqSny9KciCqwi4//ewf5Ji8fGFu/6kxIFeIjIMS0wydfYsh0kZw nyfPPFP4LH+M9EF32HP3HI+IloIOs9Ze9OoSOLK4O6KULubme34/MtHCrjzcJIfra3bxTR VDCEMhfDJ54dPyTLigdlRo3XUNrpsY1dhxII87gkWeik2Pvtm0D50JSWR0R2sDU7lX0jc5 cl7kNBc6IFSm6Y97FcO48ZCvi/bDVMQaqIo127SZsKfVfiElFAl0QzgwbP6ELg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789430253; 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=LmPvyjykoxHjwLyIRV5ngwN0A+aj76DqbsYNPwa+7gQ=; b=J6rKfebBudQTXcneFYJmEd2qwUQ7LcJuFt4tRzvn2F8f9nEPmUEwiRuffI/SPGBYkYNsXw rX33Zm3o02FQ2hDMa8A2X5U0imq5DF97wlb79W9z0hKiEDbCV2TWy0RZ+BaXHUdOaTMt6I KcRZgJ8Tf7t04Yx7YJO42p25MRfFrPEC30nrc+hOL5k3jZXUKS7FKPp30LT9aczIlEl/LY 0A0ikylJQB5zuoRYqqv6cBHj4NQPf/JMkbhP5SCBTpLGU9aNTmblU4rkEzZK/dljvqUHbv JBAt/L7PQx1yIqpH7ZDEJKT4XPO7wR1XFg04j3+/3Oc1947B+IQIqp2iMWtBaw== 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 4hkMXF3HBpzcMC for ; Mon, 14 Sep 2026 23:57:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46115 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 14 Sep 2026 23:57:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 274b0d6b113b - main - nfs_nfsdkrpc.c: Fix the "glue" for the nfsrdma.ko modules for NFSv3 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 274b0d6b113bba84a049aac3d324a10b98e52f32 Auto-Submitted: auto-generated Date: Mon, 14 Sep 2026 23:57:28 +0000 Message-Id: <6aa889e8.46115.10607dd@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=274b0d6b113bba84a049aac3d324a10b98e52f32 commit 274b0d6b113bba84a049aac3d324a10b98e52f32 Author: Rick Macklem AuthorDate: 2026-09-14 23:55:32 +0000 Commit: Rick Macklem CommitDate: 2026-09-14 23:55:32 +0000 nfs_nfsdkrpc.c: Fix the "glue" for the nfsrdma.ko modules for NFSv3 Without this patch, nd_xprt is only set for NFSv4.1/4.2. The nfsrdma.ko needs it to be set for all versions of NFS, so this one line patch does that. No semantics change for non-RDMA NFS service. MFC after: 3 months Fixes: 7144a1d58c5c ("nfsd: Add glue for the nfsrdma.ko module") --- sys/fs/nfsserver/nfs_nfsdkrpc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdkrpc.c b/sys/fs/nfsserver/nfs_nfsdkrpc.c index d96a8c354276..181e93a9ac1f 100644 --- a/sys/fs/nfsserver/nfs_nfsdkrpc.c +++ b/sys/fs/nfsserver/nfs_nfsdkrpc.c @@ -506,8 +506,7 @@ nfs_proc(struct nfsrv_descript *nd, u_int32_t xid, SVCXPRT *xprt, * RC_DROPIT - just throw the request away */ if (cacherep == RC_DOIT) { - if ((nd->nd_flag & ND_NFSV41) != 0) - nd->nd_xprt = xprt; + nd->nd_xprt = xprt; nfsrvd_dorpc(nd, isdgram, tagstr, taglen, minorvers); if ((nd->nd_flag & ND_NFSV41) != 0) { if (nd->nd_repstat != NFSERR_REPLYFROMCACHE &&