summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorConstantine Sapuntzakis <csapuntz@cvs.openbsd.org>1998-08-06 23:06:21 +0000
committerConstantine Sapuntzakis <csapuntz@cvs.openbsd.org>1998-08-06 23:06:21 +0000
commit9af34e12ce03c0974d99a18ec5dac4c7e1b77efb (patch)
tree0ca966150eace339f5a1975ecee2ff002a8efca9 /sys
parent1b793cf92899ea6e808450502f3c13a9189e266f (diff)
Fix the typos that prevented umap from working. They, of course, lead
to the obvious question: don't you run this stuff before you check it in? Sadly, the answer was no in this case. But, I'm trying to learn. Slowly, painfully....
Diffstat (limited to 'sys')
-rw-r--r--sys/miscfs/umapfs/umap_vnops.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c
index a428b043354..38a8bfb4066 100644
--- a/sys/miscfs/umapfs/umap_vnops.c
+++ b/sys/miscfs/umapfs/umap_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umap_vnops.c,v 1.10 1998/08/06 19:34:50 csapuntz Exp $ */
+/* $OpenBSD: umap_vnops.c,v 1.11 1998/08/06 23:06:20 csapuntz Exp $ */
/* $NetBSD: umap_vnops.c,v 1.5.4.1 1996/05/25 22:13:35 jtc Exp $ */
/*
@@ -371,7 +371,7 @@ int
umap_inactive(v)
void *v;
{
- struct vop_getattr_args /* {
+ struct vop_inactive_args /* {
struct vnode *a_vp;
struct proc *a_p;
} */ *ap = v;
@@ -401,11 +401,13 @@ umap_lock(v)
struct proc *a_p;
} */ *ap = v;
+#if 0
vop_generic_lock(ap);
+#endif
if ((ap->a_flags & LK_TYPE_MASK) == LK_DRAIN)
return (0);
ap->a_flags &= ~LK_INTERLOCK;
- return (null_bypass(ap));
+ return (umap_bypass(ap));
}
/*
@@ -423,9 +425,11 @@ umap_unlock(v)
struct proc *a_p;
} */ *ap = v;
+#if 0
vop_generic_unlock(ap);
+#endif
ap->a_flags &= ~LK_INTERLOCK;
- return (null_bypass(ap));
+ return (umap_bypass(ap));
}