diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2010-12-21 20:14:45 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2010-12-21 20:14:45 +0000 |
| commit | 533610cd3b12c41762f0fbaa058c868cc1458b45 (patch) | |
| tree | 866b788e63499fb184820ccec149d0e2c6d410bb /sys/kern/vfs_subr.c | |
| parent | b8f93236e139a325a6aec2b47b12ecbfab8aaf99 (diff) | |
Bring back the "End the VOP experiment." diff, naddy's issues where
unrelated, and his alpha is much happier now.
OK deraadt@
Diffstat (limited to 'sys/kern/vfs_subr.c')
| -rw-r--r-- | sys/kern/vfs_subr.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index f3488ca71e2..bbd8b34d690 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_subr.c,v 1.192 2010/12/06 18:44:49 jasper Exp $ */ +/* $OpenBSD: vfs_subr.c,v 1.193 2010/12/21 20:14:43 thib Exp $ */ /* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */ /* @@ -301,14 +301,13 @@ vattr_null(struct vattr *vap) /* * Routines having to do with the management of the vnode table. */ -extern int (**dead_vnodeop_p)(void *); long numvnodes; /* * Return the next vnode from the free list. */ int -getnewvnode(enum vtagtype tag, struct mount *mp, int (**vops)(void *), +getnewvnode(enum vtagtype tag, struct mount *mp, struct vops *vops, struct vnode **vpp) { struct proc *p = curproc; @@ -464,7 +463,7 @@ getdevvp(dev_t dev, struct vnode **vpp, enum vtype type) *vpp = NULLVP; return (0); } - error = getnewvnode(VT_NON, NULL, spec_vnodeop_p, &nvp); + error = getnewvnode(VT_NON, NULL, &spec_vops, &nvp); if (error) { *vpp = NULLVP; return (error); @@ -861,7 +860,7 @@ vflush_vnode(struct vnode *vp, void *arg) { vgonel(vp, p); } else { vclean(vp, 0, p); - vp->v_op = spec_vnodeop_p; + vp->v_op = &spec_vops; insmntque(vp, (struct mount *)0); } return (0); @@ -967,7 +966,7 @@ vclean(struct vnode *vp, int flags, struct proc *p) /* * Done with purge, notify sleepers of the grim news. */ - vp->v_op = dead_vnodeop_p; + vp->v_op = &dead_vops; VN_KNOTE(vp, NOTE_REVOKE); vp->v_tag = VT_NON; vp->v_flag &= ~VXLOCK; |