From nobody Thu Aug 6 19:52:47 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 4hGHxq688Pz6n6Z2 for ; Thu, 06 Aug 2026 19:52:47 +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 4hGHxq5KHHz44D8 for ; Thu, 06 Aug 2026 19:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786045967; 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=kB05tzvzl5jHZCUppAgUhwPxOI2mD2JFfum6VhaVcow=; b=N3HPci1cQuaAjOOZvQFQbSgkU7RvDL7+IS5MwhOVTLsoFmr34HAp715BqKxN4S4iazi/P8 zsrCPuuzjLfrg62rv+Vc+KRqfxdEx8v7E6etu3UnABFqGuxe47D5hC5cmjze2BkGltJ0CS exfkRI7rrMXSTbaPYeBc16Lc8k37/TAi4zC1O1LB1EHBNVOn9SZl5lyrJvjT/Psywz2rKk USu9eNgUlDBIh70vi6lG6sFd0ZOdGZ6w9yZ/GBgbQwuMtfKlP04Wp6rKTIZgetbgn1DaUO 89WddY+K1DoId9mUQiCIPUnaa1mF5JqpFHHiNMAhzv01HmMNL+Q+IDGC/RtTcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786045967; a=rsa-sha256; cv=none; b=uOcPQn/cl2JFzb0Pbx0/a2Evx3FgZuW7p+a/KnAUqflDjmlz2F58gUa6FYnQzHmJi/1DaP r0LAwHRy9pCWqqoirdsJYv/atVESly0sFslITtksfgLSDX8JrXstLZEI2uos/y1egscih2 9bvqZP78+FTO9HiwcvDlwF8UFF1tCe6hdtKaaLsNUAYuWFj5PXcxVH3JHrgj1LeMSknYNW pbOCJs25hAjgrVcDVFOx+uBLNPyVD0eIm6gelRyOn9zKupeV0feahQKbf7jzivb3tFXA9a AIaMoCCbc7dzZc8sjN5FVkBv4M/EbQfZ8tEQyfZSTcM4jqOLBdRm9vKqxUDclQ== 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=1786045967; 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=kB05tzvzl5jHZCUppAgUhwPxOI2mD2JFfum6VhaVcow=; b=vnySH5SYTxSRW0v1666yHugl3U3kt5nReSVOiPlUrW0HgB5ZjEQIMeNYbFyxFSsYrtCxvp 91zD2+IhqApfeS1t+kXOcHPAx7AOzD9dB4odvUIlrrNCBpBQfQOiMC1y0QLSK6WM/y17o4 i4DssLAZC9w38dVOEJbOHwECc6yIHJPVjvqLxyU7TNz0JsoiwSX8xVKa7xJ3vm/SUCIeVZ bk9k7kP1qv/+SSkyxx4OFL9HGz4qaof/L4GOLOhBzopE5chblVJm8i8vmN/cQKhjwNYC5w nHt6AgA0hV+7T8WgZfcjswVBdUi8DK3kDn39h8CMC3RSeXprv9yJR1WZF+npsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGHxq43rfzbfy for ; Thu, 06 Aug 2026 19:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e3af by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 19:52:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: ca0dcfd1a8ec - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: ca0dcfd1a8ecbd7f4f99b06adcb5d67c8742679c Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 19:52:47 +0000 Message-Id: <6a74e60f.3e3af.35ff135a@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=ca0dcfd1a8ecbd7f4f99b06adcb5d67c8742679c commit ca0dcfd1a8ecbd7f4f99b06adcb5d67c8742679c Author: Rick Macklem AuthorDate: 2026-08-03 23:57:38 +0000 Commit: Rick Macklem CommitDate: 2026-08-06 19:51:27 +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 28f83f460245..e6c09c132a8a 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1261,9 +1261,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 &&