From owner-svn-src-all@freebsd.org  Sun Apr  9 21:50:22 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 C2BABD362DA;
 Sun,  9 Apr 2017 21:50:22 +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 949BEECF;
 Sun,  9 Apr 2017 21:50:22 +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 v39LoLMd056729;
 Sun, 9 Apr 2017 21:50:21 GMT (envelope-from rmacklem@FreeBSD.org)
Received: (from rmacklem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v39LoLw3056728;
 Sun, 9 Apr 2017 21:50:21 GMT (envelope-from rmacklem@FreeBSD.org)
Message-Id: <201704092150.v39LoLw3056728@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: Sun, 9 Apr 2017 21:50:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r316667 - head/sys/fs/nfsclient
X-SVN-Group: head
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: Sun, 09 Apr 2017 21:50:22 -0000

Author: rmacklem
Date: Sun Apr  9 21:50:21 2017
New Revision: 316667
URL: https://svnweb.freebsd.org/changeset/base/316667

Log:
  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.
  
  Tested by:	cperciva
  PR:		215887
  MFC after:	2 weeks

Modified:
  head/sys/fs/nfsclient/nfs_clport.c

Modified: head/sys/fs/nfsclient/nfs_clport.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clport.c	Sun Apr  9 21:06:21 2017	(r316666)
+++ head/sys/fs/nfsclient/nfs_clport.c	Sun Apr  9 21:50:21 2017	(r316667)
@@ -1196,7 +1196,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;