summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcsapuntz <csapuntz@openbsd.org>1998-08-06 21:28:45 +0000
committercsapuntz <csapuntz@openbsd.org>1998-08-06 21:28:45 +0000
commit1df184b9a6bd355449838b927068bb2c25ee2c06 (patch)
tree1955dda8510d068e09d00aad754392181a98c985
parentthere is no <sys/kinfo*.h> and s/KINFO_PROC/KERN_PROC/ (diff)
downloadwireguard-openbsd-1df184b9a6bd355449838b927068bb2c25ee2c06.tar.xz
wireguard-openbsd-1df184b9a6bd355449838b927068bb2c25ee2c06.zip
Don't pass vclean related stuff to the lower vnode. It makes it very unhappy.
-rw-r--r--sys/miscfs/nullfs/null_vnops.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c
index 127d7c51ef4..bb3650facfc 100644
--- a/sys/miscfs/nullfs/null_vnops.c
+++ b/sys/miscfs/nullfs/null_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: null_vnops.c,v 1.10 1998/08/06 19:34:42 csapuntz Exp $ */
+/* $OpenBSD: null_vnops.c,v 1.11 1998/08/06 21:28:45 csapuntz Exp $ */
/* $NetBSD: null_vnops.c,v 1.7 1996/05/10 22:51:01 jtk Exp $ */
/*
@@ -500,10 +500,11 @@ null_lock(v)
#if 0
vop_generic_lock(ap);
+#endif
if ((ap->a_flags & LK_TYPE_MASK) == LK_DRAIN)
return (0);
ap->a_flags &= ~LK_INTERLOCK;
-#endif
+
return (null_bypass((struct vop_generic_args *)ap));
}
@@ -514,8 +515,9 @@ null_unlock(v)
struct vop_unlock_args *ap = v;
#if 0
vop_generic_unlock(ap);
- ap->a_flags &= ~LK_INTERLOCK;
#endif
+ ap->a_flags &= ~LK_INTERLOCK;
+
return (null_bypass((struct vop_generic_args *)ap));
}