diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-10-06 20:23:17 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-10-06 20:23:17 +0000 |
| commit | 85674180ac0b414993bec634994ea51b28390306 (patch) | |
| tree | 5ce384dfed739e368b8605fc6db4ed1f26a43609 /sys/miscfs/umapfs/umap_subr.c | |
| parent | 44f83f3e77b70fbce9f014e39cf5c97bae700213 (diff) | |
back out vfs lite2 till after 2.2
Diffstat (limited to 'sys/miscfs/umapfs/umap_subr.c')
| -rw-r--r-- | sys/miscfs/umapfs/umap_subr.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c index 93bbdd51917..fd234f356c9 100644 --- a/sys/miscfs/umapfs/umap_subr.c +++ b/sys/miscfs/umapfs/umap_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umap_subr.c,v 1.9 1997/10/06 15:19:14 csapuntz Exp $ */ +/* $OpenBSD: umap_subr.c,v 1.10 1997/10/06 20:20:41 deraadt Exp $ */ /* $NetBSD: umap_subr.c,v 1.8 1996/03/05 02:35:39 thorpej Exp $ */ /* @@ -42,7 +42,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/proc.h> #include <sys/time.h> #include <sys/types.h> #include <sys/vnode.h> @@ -76,15 +75,14 @@ static int umap_node_alloc __P((struct mount *, struct vnode *, /* * Initialise cache headers */ -int -umapfs_init(struct vfsconf *vfsp) +void +umapfs_init() { #ifdef UMAPFS_DIAGNOSTIC printf("umapfs_init\n"); /* printed during system boot */ #endif umap_node_hashtbl = hashinit(NUMAPNODECACHE, M_CACHE, &umap_node_hash); - return (0); } /* @@ -143,7 +141,6 @@ umap_node_find(mp, targetvp) struct mount *mp; struct vnode *targetvp; { - struct proc *p = curproc; struct umap_node_hashhead *hd; struct umap_node *a; struct vnode *vp; @@ -169,7 +166,7 @@ loop: * stuff, but we don't want to lock * the lower node. */ - if (vget(vp, 0, p)) { + if (vget(vp, 0)) { #ifdef UMAPFS_DIAGNOSTIC printf ("umap_node_find: vget failed.\n"); #endif @@ -201,7 +198,6 @@ umap_node_alloc(mp, lowervp, vpp) struct umap_node *xp; struct vnode *vp, *nvp; int error; - struct proc *p = curproc; extern int (**dead_vnodeop_p) __P((void *)); if ((error = getnewvnode(VT_UMAP, mp, umap_vnodeop_p, &vp)) != 0) @@ -263,14 +259,14 @@ loop: vgone(cvp); goto loop; } - if (vget(cvp, 0, p)) /* can't lock; will die! */ + if (vget(cvp, 0)) /* can't lock; will die! */ goto loop; break; } vp->v_hashchain = cvpp; vp->v_specnext = *cvpp; - vp->v_specmountpoint = NULL; + vp->v_specflags = 0; *cvpp = vp; #ifdef DIAGNOSTIC if (cvp == NULLVP) |