From nobody Tue Aug 4 00:09:44 2026 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 4hDYnp2Vm5z6nKW3 for ; Tue, 04 Aug 2026 00:09: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hDYnp0SdGz3VVC for ; Tue, 04 Aug 2026 00:09:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785802190; 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=a5/7W1x6dOFtnHrlSJpxBKc/mnf+UvBKCuzCfCEZTk0NxEBfyVVb2UtWEFCuUJXeVdTgjX m18ThO4psmEseaIA5Hs/zvSrrwDNszL5bBrtsRCdq3aDgcDrnx3JGa/TRvWa469a3PodrY svbZmsFtNtItiIZPjcUve79iqDF4VQKen4M+XUxFM/7gOf8Ru7VIhZjRkvhLDYVM6/uTBe OrJEybOf2yLsUCKD3TWP5zRTM6+S3QALSXFaVknVQmPa9n6sbfurxCI4mmWhDWOAAGx0kx UrjShasog7lOBKE8y2vnQ4xP2vNiKF/E/Um0hCI2uxWQKjibzx6s6N/ylUFJYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785802190; a=rsa-sha256; cv=none; b=laj5rXA/pFuZLXAmmvhLZ4MRjLAZ1cElGTakriIbgJpn9CZ3CetdiijYghihUA+o1C/H1t CGSavqUlgNSeYTQMnuFONoNk/adtJXXdPOHOeCTrwEW650CnNtYpue1VpnirGpPGgy9ElT CECD1x9NWAXOaOrfg5XHBjf1fKbE/qOUQXhTSbJaqhsTPCmMnwF4cCZbbJMTeXwpvdm155 un4tkNzwDBdDBG4y913E2TNKeRSujRH8+Z5MFsY98XK5srIveOM/amHt5DcFYsSGHs+fQT N6iqGTODgIFHiNtkjcj2DibybCs7CRv5YiydLZXKRFooOHm4YP9kn4B4Yt7Wng== 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=1785802190; 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=X056+9cTuKe4lI6zYd8btDJd+HnWx1IuMBl6eifbHDGpLBpLsiTBSL3MIJvkGZ+Eqg71Rr y4rLYtriZoRlD9xvgfKLaiH6hHGMQptrveofxt2cBZrpd+tV+lBwtbzjLTZGBKv5ilmSqz HDa+umJ2C4vJPwv1T3SFaUTiiowfQZcylF6P9TnTZYbnrgm8lEyKG8lqrSrfU5viGSNHXs fhd4sNIUnZpRs97seHIQ6Rax6teuvANDHPvmhzpyQgfoXdR7Bde+lnn269Vbd0+KbF0zol 7UjZJZd2/Iw3EzCgouo6PxHcA5h0garEl7OnJTgVp/rNtjuMEWCAZsRQuukQ3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDYnn6K1gz7JT for ; Tue, 04 Aug 2026 00:09:49 +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 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 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 &&