summaryrefslogtreecommitdiff
path: root/sys/miscfs/umapfs/umap_vnops.c
diff options
context:
space:
mode:
authorConstantine Sapuntzakis <csapuntz@cvs.openbsd.org>1998-08-06 19:35:18 +0000
committerConstantine Sapuntzakis <csapuntz@cvs.openbsd.org>1998-08-06 19:35:18 +0000
commit89fedd1a8d2624bae7d2310a83d39156079353b6 (patch)
tree85d9d00a998016639251d59ff97e2a4df0bfa685 /sys/miscfs/umapfs/umap_vnops.c
parent67f0f9ef8777688f212974c7fd984398c1827902 (diff)
Rename vop_revoke, vn_bwrite, vop_noislocked, vop_nolock, vop_nounlock
to be vop_generic_revoke, vop_generic_bwrite, vop_generic_islocked, vop_generic_lock and vop_generic_unlock. Create vop_generic_abortop and propogate change to all file systems. Fix PR/371. Get rid of locking in NULLFS (should be mostly unnecessary now except for forced unmounts).
Diffstat (limited to 'sys/miscfs/umapfs/umap_vnops.c')
-rw-r--r--sys/miscfs/umapfs/umap_vnops.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c
index 14a23102aed..a428b043354 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.9 1997/11/06 05:58:49 csapuntz Exp $ */
+/* $OpenBSD: umap_vnops.c,v 1.10 1998/08/06 19:34:50 csapuntz Exp $ */
/* $NetBSD: umap_vnops.c,v 1.5.4.1 1996/05/25 22:13:35 jtc Exp $ */
/*
@@ -401,7 +401,7 @@ umap_lock(v)
struct proc *a_p;
} */ *ap = v;
- vop_nolock(ap);
+ vop_generic_lock(ap);
if ((ap->a_flags & LK_TYPE_MASK) == LK_DRAIN)
return (0);
ap->a_flags &= ~LK_INTERLOCK;
@@ -423,7 +423,7 @@ umap_unlock(v)
struct proc *a_p;
} */ *ap = v;
- vop_nounlock(ap);
+ vop_generic_unlock(ap);
ap->a_flags &= ~LK_INTERLOCK;
return (null_bypass(ap));
}