From owner-svn-src-head@FreeBSD.ORG  Wed Apr 28 23:16:21 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8EA87106564A;
	Wed, 28 Apr 2010 23:16:21 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7DF858FC0C;
	Wed, 28 Apr 2010 23:16:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3SNGL6F022583;
	Wed, 28 Apr 2010 23:16:21 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3SNGL2b022581;
	Wed, 28 Apr 2010 23:16:21 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201004282316.o3SNGL2b022581@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Wed, 28 Apr 2010 23:16:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207350 - head/sys/fs/nfsclient
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Apr 2010 23:16:21 -0000

Author: rmacklem
Date: Wed Apr 28 23:16:21 2010
New Revision: 207350
URL: http://svn.freebsd.org/changeset/base/207350

Log:
  For the experimental NFS client, it should always flush dirty
  buffers before closing the NFSv4 opens, as the comment states.
  This patch deletes the call to nfscl_mustflush() which would
  return 0 for the case where a delegation still exists, which
  was incorrect and could cause crashes during recovery from
  an expired lease.
  
  MFC after:	1 week

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

Modified: head/sys/fs/nfsclient/nfs_clnode.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clnode.c	Wed Apr 28 23:05:42 2010	(r207349)
+++ head/sys/fs/nfsclient/nfs_clnode.c	Wed Apr 28 23:16:21 2010	(r207350)
@@ -198,8 +198,7 @@ ncl_inactive(struct vop_inactive_args *a
 		 * must be flushed before the close, so that the stateid is
 		 * available for the writes.
 		 */
-		if (nfscl_mustflush(vp))
-			(void) ncl_flush(vp, MNT_WAIT, NULL, ap->a_td, 1, 0);
+		(void) ncl_flush(vp, MNT_WAIT, NULL, ap->a_td, 1, 0);
 		(void) nfsrpc_close(vp, 1, ap->a_td);
 	}