From owner-svn-src-all@freebsd.org  Tue Apr 25 19:48:27 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 53313D50DCE;
 Tue, 25 Apr 2017 19:48:27 +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 249441BF8;
 Tue, 25 Apr 2017 19:48:27 +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 v3PJmQJR048034;
 Tue, 25 Apr 2017 19:48:26 GMT (envelope-from rmacklem@FreeBSD.org)
Received: (from rmacklem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3PJmQpx048033;
 Tue, 25 Apr 2017 19:48:26 GMT (envelope-from rmacklem@FreeBSD.org)
Message-Id: <201704251948.v3PJmQpx048033@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:48:26 +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: r317420 - stable/10/sys/fs/nfsclient
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Apr 2017 19:48:27 -0000

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

Log:
  MFC: r316667
  Fix the NFSv4 client hndling of a stale write verifier in the Commit operation.
  
  When the NFSv4 client Commit operation encountered a stale write verifier,
  it erroneously mapped that to EIO. This could have caused recently written
  data to be lost when a server crashes/reboots between an UNSTABLE write
  and the subsequent commit. This patch fixes this.
  The bug was only for the NFSv4 client and did not affect NFSv3.

Modified:
  stable/10/sys/fs/nfsclient/nfs_clport.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/nfsclient/nfs_clport.c
==============================================================================
--- stable/10/sys/fs/nfsclient/nfs_clport.c	Tue Apr 25 19:35:13 2017	(r317419)
+++ stable/10/sys/fs/nfsclient/nfs_clport.c	Tue Apr 25 19:48:25 2017	(r317420)
@@ -1125,7 +1125,7 @@ nfscl_maperr(struct thread *td, int erro
 {
 	struct proc *p;
 
-	if (error < 10000)
+	if (error < 10000 || error >= NFSERR_STALEWRITEVERF)
 		return (error);
 	if (td != NULL)
 		p = td->td_proc;