svn commit: r207691 - stable/8/sys/fs/nfsclient

[Rick Macklem]

Author: rmacklem
Date: Thu May  6 01:08:36 2010
New Revision: 207691
URL: http://svn.freebsd.org/changeset/base/207691

Log:
  MFC: r207350
  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.

Modified:
  stable/8/sys/fs/nfsclient/nfs_clnode.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/fs/nfsclient/nfs_clnode.c
==============================================================================
--- stable/8/sys/fs/nfsclient/nfs_clnode.c	Thu May  6 00:49:10 2010	(r207690)
+++ stable/8/sys/fs/nfsclient/nfs_clnode.c	Thu May  6 01:08:36 2010	(r207691)
@@ -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);
 	}