From nobody Tue Aug 4 00:09:44 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 4hDYnh6FgJz6nKmM for ; Tue, 04 Aug 2026 00:09:44 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hDYnh51HCz3Vhp for ; Tue, 04 Aug 2026 00:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785802184; 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=lGBZYiIImWqVNIarV9posQ48RcV6vwqHtC1iEz1NTVg=; b=UGn2Ljlg6GolbsfjNIIdy7E7aad0rs8MmCPuF2CVRA4C5Hf4d0lwbwWH3TIUmSpPT4ZTpl jZe/2xZlqvO7EHUV1xZJtJaqiAWoVUy+crMtGyw/kFAI0KxHGagsHHBJBkrHLOVgE7eL4L lPAWkAj0U12IwAt4MsgCK0UH/u/dzld2v4ev6aO2+HTTdJyF1JNuthry+pD3N77mqj4KuH aNurcpomaS6Tg7z8BEg3p6gNwj/+ieQSXog5JPj1R8p3gWrJdeCFSoJuKpoMvKKSFWg70B MlX/0cIQDwLKz5EZLjmSiIHjJNY1emFYj4PxRjcc3QFVVo+PXLU/L1msqu+UXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785802184; a=rsa-sha256; cv=none; b=MajSQkOwYzE2VADdqnv4vZwZhk433t+k+sMYtatvLCG5TSjIfL6D36hVjUgYKQvOQLdDnI RctCGRiqskJP9SiA+PdflPvasWWDzuh7SK3ftg3T9B8aGiI+CyWD276y5upwfs1MJ+RMus QFSfRv/Re5SOQr1tGTDe8fhX+BMFs7Y2vPFiOauUXx4sAAUt5PLJ2kcIdr/AK+amISFTYZ EIHbeShyfjfRyeXal/6L47Eu1CxglU9Bh/vJ6EuKvu2ltgMNcNPO4B4ceBT4th8Xs7ubsN hRHOgB14R9mcoBnG0oHDja4Fy++JRnbufXGSzB1MOJSD9eQfW2u2m7tbP/ka5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785802184; 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=lGBZYiIImWqVNIarV9posQ48RcV6vwqHtC1iEz1NTVg=; b=CwgJuPb6iZPMVBYMk8AN6aSyKSdPS/5yjTqcydFEwSobBcQ7VAX61vBu3P3JCwKAkREGRy P1Nz2V0tLF0Wp0BfQ+enOKWX365LC9itcSfhGi0KzlPi4e3Erx8zl66QCPTxpyvYMTnvvy PTb3iCdQma+hDfS53YHgM3kjW17OC1DS+6z8/NqLhMUm15oEhQYhgD39HEj1VZU6q5rmwH WCPcfvpJ76Z60LppS7JKpQV3Ddr2C2irNVWoCRSRXUTxnmirbp2uqIS6h/gvowM0hfFRc3 4C/M4qkAsf8NnGA3gXHiBx3zkGOK1qPr0iSu3KONErqJxxXBDwaUSBWwBVprEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDYnh46YSz7FV for ; Tue, 04 Aug 2026 00:09:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24188 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 04 Aug 2026 00:09:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 5ab48fb9f7ac - main - nfs_commonkrpc.c: Fix recovery that was broken by 4d80d4913e79 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: 5ab48fb9f7ac43fb1242a678312a02df5d4d5b53 Auto-Submitted: auto-generated Date: Tue, 04 Aug 2026 00:09:44 +0000 Message-Id: <6a712dc8.24188.7083fb16@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=5ab48fb9f7ac43fb1242a678312a02df5d4d5b53 commit 5ab48fb9f7ac43fb1242a678312a02df5d4d5b53 Author: Rick Macklem AuthorDate: 2026-08-03 23:57:38 +0000 Commit: Rick Macklem CommitDate: 2026-08-04 00:02:47 +0000 nfs_commonkrpc.c: Fix recovery that was broken by 4d80d4913e79 Commit 4d80d4913e79 added a check for nfsess_defunct already being set. This was incorrect because, once set, nfsess_defunct remains set and an additional recovery might be needed. This patch reverts this part of 4d80d4913e79. PR: 297252 Suggested by: olivier MFC after: 3 days Fixes: 4d80d4913e79 ("nfs: Fix argument typo to avoid a crash") --- sys/fs/nfs/nfs_commonkrpc.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index dd189a4aa909..705e65d81d41 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1279,9 +1279,15 @@ tryagain: } sep = NFSMNT_MDSSESSION(nmp); if (bcmp(sep->nfsess_sessionid, - nd->nd_sessionid, NFSX_V4SESSIONID) == 0 && - sep->nfsess_defunct == 0) { - /* Initiate recovery. */ + nd->nd_sessionid, NFSX_V4SESSIONID) == 0) { + /* + * Initiate recovery. Even if + * nfsess_defunct is already set, + * another recovery may be needed. + * NFSCLFLAGS_RECVRINPRG | + * NFSCLFLAGS_RECOVER should avoid + * recovery storms. + */ sep->nfsess_defunct = 1; NFSCL_DEBUG(1, "Marked defunct\n"); if (nmp->nm_clp != NULL &&