diff options
| author | John Dyson <dyson@FreeBSD.org> | 1998-02-05 16:40:57 +0000 |
|---|---|---|
| committer | John Dyson <dyson@FreeBSD.org> | 1998-02-05 16:40:57 +0000 |
| commit | 857fe6801aa5489f33ccb2cc590ebfc170d42521 (patch) | |
| tree | 10d6f8c01fe4f2c9785d8ac2761dc4c86d47e134 | |
| parent | a4f897aa965917765ec60510b9a460f68fe39356 (diff) | |
Notes
| -rw-r--r-- | sys/nfs/nfs_vfsops.c | 5 | ||||
| -rw-r--r-- | 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 @@ loop: */ 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 @@ loop: */ 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; |