From owner-svn-src-stable@freebsd.org  Tue Apr 25 19:35:15 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1FFCBD509D0;
 Tue, 25 Apr 2017 19:35:15 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E57A314E3;
 Tue, 25 Apr 2017 19:35:14 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3PJZD1n043604;
 Tue, 25 Apr 2017 19:35:13 GMT (envelope-from rmacklem@FreeBSD.org)
Received: (from rmacklem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3PJZDng043603;
 Tue, 25 Apr 2017 19:35:13 GMT (envelope-from rmacklem@FreeBSD.org)
Message-Id: <201704251935.v3PJZDng043603@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to
 rmacklem@FreeBSD.org using -f
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Tue, 25 Apr 2017 19:35:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r317419 - stable/10/sys/fs/nfs
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Apr 2017 19:35:15 -0000

Author: rmacklem
Date: Tue Apr 25 19:35:13 2017
New Revision: 317419
URL: https://svnweb.freebsd.org/changeset/base/317419

Log:
  MFC: r316666
  Fix the NFSv4.1 client for NFSERR_BADSESSION recovery via ReclaimComplete.
  
  For the ReclaimComplete operation, the RPC layer should not loop on
  NFSERR_BADSESSION. If it does, the recovery thread (nfscl) can get stuck
  looping and will not do a recovery.
  This patch fixes it so it does not loop. This bug only affects NFSv4.1 and
  only when a server reboots.

Modified:
  stable/10/sys/fs/nfs/nfs_commonsubs.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- stable/10/sys/fs/nfs/nfs_commonsubs.c	Tue Apr 25 19:14:31 2017	(r317418)
+++ stable/10/sys/fs/nfs/nfs_commonsubs.c	Tue Apr 25 19:35:13 2017	(r317419)
@@ -148,7 +148,7 @@ struct nfsv4_opflag nfsv4_opflag[NFSV41_
 	{ 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 },		/* Test StateID */
 	{ 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 },		/* Want Delegation */
 	{ 0, 0, 0, 0, LK_EXCLUSIVE, 0, 0 },		/* Destroy ClientID */
-	{ 0, 0, 0, 0, LK_EXCLUSIVE, 1, 1 },		/* Reclaim Complete */
+	{ 0, 0, 0, 0, LK_EXCLUSIVE, 1, 0 },		/* Reclaim Complete */
 };
 #endif	/* !APPLEKEXT */