Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/nfs revert a change that I accidentally included with ub...



details:   https://anonhg.NetBSD.org/src/rev/2daca51ba546
branches:  trunk
changeset: 515899:2daca51ba546
user:      chs <chs%NetBSD.org@localhost>
date:      Mon Oct 08 00:22:13 2001 +0000

description:
revert a change that I accidentally included with ubcperf.

diffstat:

 sys/nfs/nfs_vfsops.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r 9bb445b41be2 -r 2daca51ba546 sys/nfs/nfs_vfsops.c
--- a/sys/nfs/nfs_vfsops.c      Sun Oct 07 22:31:02 2001 +0000
+++ b/sys/nfs/nfs_vfsops.c      Mon Oct 08 00:22:13 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_vfsops.c,v 1.109 2001/09/20 08:22:04 chs Exp $     */
+/*     $NetBSD: nfs_vfsops.c,v 1.110 2001/10/08 00:22:13 chs Exp $     */
 
 /*
  * Copyright (c) 1989, 1993, 1995
@@ -883,11 +883,11 @@
                 */
                if (vp->v_mount != mp)
                        goto loop;
-               if (waitfor == MNT_LAZY ||
+               if (waitfor == MNT_LAZY || VOP_ISLOCKED(vp) ||
                    (LIST_EMPTY(&vp->v_dirtyblkhd) &&
                     vp->v_uobj.uo_npages == 0))
                        continue;
-               if (vget(vp, LK_EXCLUSIVE | LK_NOWAIT))
+               if (vget(vp, LK_EXCLUSIVE))
                        goto loop;
                error = VOP_FSYNC(vp, cred,
                    waitfor == MNT_WAIT ? FSYNC_WAIT : 0, 0, 0, p);



Home | Main Index | Thread Index | Old Index