From 857fe6801aa5489f33ccb2cc590ebfc170d42521 Mon Sep 17 00:00:00 2001
From: John Dyson <dyson@FreeBSD.org>
Date: Thu, 5 Feb 1998 16:40:57 +0000
Subject: [PATCH] Fix an omission of a line from the previous commit to this
 file.  The problem appeared to be an NFS hang.

---
 sys/nfs/nfs_vfsops.c       | 5 +++--
 sys/nfsclient/nfs_vfsops.c | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index d7f112efdae1..2776facbd6bb 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.12 (Berkeley) 5/20/95
- * $Id: nfs_vfsops.c,v 1.51 1997/10/28 15:59:12 bde Exp $
+ * $Id: nfs_vfsops.c,v 1.52 1997/11/12 05:42:21 julian Exp $
  */
 
 #include <sys/param.h>
@@ -956,7 +956,8 @@ nfs_sync(mp, waitfor, cred, p)
 		 */
 		if (vp->v_mount != mp)
 			goto loop;
-		if (VOP_ISLOCKED(vp) || vp->v_dirtyblkhd.lh_first == NULL)
+		if (VOP_ISLOCKED(vp) || vp->v_dirtyblkhd.lh_first == NULL ||
+		    waitfor == MNT_LAZY)
 			continue;
 		if (vget(vp, LK_EXCLUSIVE, p))
 			goto loop;
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index d7f112efdae1..2776facbd6bb 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.12 (Berkeley) 5/20/95
- * $Id: nfs_vfsops.c,v 1.51 1997/10/28 15:59:12 bde Exp $
+ * $Id: nfs_vfsops.c,v 1.52 1997/11/12 05:42:21 julian Exp $
  */
 
 #include <sys/param.h>
@@ -956,7 +956,8 @@ nfs_sync(mp, waitfor, cred, p)
 		 */
 		if (vp->v_mount != mp)
 			goto loop;
-		if (VOP_ISLOCKED(vp) || vp->v_dirtyblkhd.lh_first == NULL)
+		if (VOP_ISLOCKED(vp) || vp->v_dirtyblkhd.lh_first == NULL ||
+		    waitfor == MNT_LAZY)
 			continue;
 		if (vget(vp, LK_EXCLUSIVE, p))
 			goto loop;