From nobody Thu Aug 6 19:46:33 2026 X-Original-To: dev-commits-src-branches@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 4hGHpd5RRXz6n6DH for ; Thu, 06 Aug 2026 19:46: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGHpd4sg4z42hS for ; Thu, 06 Aug 2026 19:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786045593; 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=iN3f/3H0f5LSM9mPilOuk5tLqeT0jjQKYw1EU+eaSpQ=; b=oM01SMu9Y8LNwj6FPEMBt+ZxLmNP72yObhnV89GfGNbYAlAOptETDZKDYdrTgASqotGeKu YjJrP+kv3/8sInOjgI8AHjOMAoy6l9nHxR4uABKKJ6K0xs55M2Uyq15J8WU2LMnxqUV324 L+o++rY2o+HldcM4KWGq5sDMT89SwdG6LCTiLGdyR7WL90ABAtvoFjHyGLKLqcp1b0g+xr a3+3HMCrSB6r1Fgth2BPcLN6FHtPm1AJ1XOUV1RYl0ENfJZrD0SWtGVuqK1Wfroab30OCG 9FA0BerNtQE7boc++7/0wEnBZWjgBjOwwX0ynlGYkMTnA4KeZfHMyjFy5cNLKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786045593; a=rsa-sha256; cv=none; b=pMo60jxKUsPdhEaCys6bBVed1+a2ypaWkuAJ/bgGI3kpUfGxDqqxlsRce2K/dtvnjDTx49 29o3ZXDC0jiLDVYTK1U2NvMfsYgI2krD3vdWRDOGwdcOQlY5bvcisLBxT9ZKtvaqKmaDSH t9wDef/9MUacaeEB59/mz3NEeDsAHt0PaUQsEoixFTFvV+sodbLKCVdRC2QsJPQQov4CeP +bjpoWpFphvyKKGXIqoNipjP8+40XNTCzBT4xDwyT3h2U0R2IRtCiY087/BtmP1fTIhMix z17cvegvMk5ULKw6wOwtXPjxMwSA17pN3RP2PWGsVasElktndTigwyb74vH87A== 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=1786045593; 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=iN3f/3H0f5LSM9mPilOuk5tLqeT0jjQKYw1EU+eaSpQ=; b=Ac8T/aqRzEXXgF2BG73mufvs7aZBNFA/4HiIKmVWI51wADP/ZjDbm5DlbgwG+p4bu93A7c +uZ0oGh8xSQVCH+p2W76a4zRb8lvOQQtzmcEGW9Tb6Pj31wFofB/KzSwbhxbLBX5THYzxa j+NLjUwawNinWBnOgq8kZFRX4Ny6yaPf8mO0hpvZXNNhQ2gPsQOvOQpWDk9rQkECiUwCVQ AYiD1xCDoOcQqg0K2D6I3UN+8gi/xxdylcw4qN+h7YpqvHGwtLRObKBqAnvedTF4rNs7zD SqUAfnn8ljgkED43jHAtsgcA90C8f2UyNRTowe8xbViRgItCj6yTINQYQj5p+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGHpd3yCNzZyn for ; Thu, 06 Aug 2026 19:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b861 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 19:46:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 037232c20015 - stable/15 - nfs_commonkrpc.c: Fix recovery that was broken by 4d80d4913e79 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 037232c2001528995d75556c8e2007c686e50134 Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 19:46:33 +0000 Message-Id: <6a74e499.3b861.4c11cb20@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=037232c2001528995d75556c8e2007c686e50134 commit 037232c2001528995d75556c8e2007c686e50134 Author: Rick Macklem AuthorDate: 2026-08-03 23:57:38 +0000 Commit: Rick Macklem CommitDate: 2026-08-06 19:45:02 +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 (cherry picked from commit 5ab48fb9f7ac43fb1242a678312a02df5d4d5b53) --- 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 &&