diff options
| author | dt <dt@FreeBSD.org> | 1998-10-14 15:05:52 +0000 |
|---|---|---|
| committer | dt <dt@FreeBSD.org> | 1998-10-14 15:05:52 +0000 |
| commit | 1f69c742ab24044ec9addb4057e26f4e68ae479f (patch) | |
| tree | 58482028b1ff3f94326196b6bac1d34b95ddf01f /sys/kern | |
| parent | 1a9a80c3f7ceafb6f6d5ab3de9c11c8da0420dc1 (diff) | |
| download | FreeBSD-src-1f69c742ab24044ec9addb4057e26f4e68ae479f.zip FreeBSD-src-1f69c742ab24044ec9addb4057e26f4e68ae479f.tar.gz | |
Backed out rev. 1.164. It caused problems on SMP.
PR: 8309
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/vfs_export.c | 14 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 14 |
2 files changed, 2 insertions, 26 deletions
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index a5258d8..867cf88 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $Id: vfs_subr.c,v 1.164 1998/10/12 20:14:09 dt Exp $ + * $Id: vfs_subr.c,v 1.165 1998/10/13 08:24:41 dg Exp $ */ /* @@ -81,7 +81,6 @@ static void printlockedvnodes __P((void)); static void vclean __P((struct vnode *vp, int flags, struct proc *p)); static void vfree __P((struct vnode *)); static void vgonel __P((struct vnode *vp, struct proc *p)); -static __inline void vfs_object_destroy __P((struct vnode *)); static unsigned long numvnodes; SYSCTL_INT(_debug, OID_AUTO, numvnodes, CTLFLAG_RD, &numvnodes, 0, ""); @@ -1301,15 +1300,6 @@ vref(struct vnode *vp) simple_unlock(&vp->v_interlock); } -static __inline void -vfs_object_destroy(vp) - struct vnode* vp; -{ - if (vp->v_type == VBLK && vp->v_object != NULL && - vp->v_object->ref_count == 0) - vm_object_terminate(vp->v_object); -} - /* * Vnode put/release. * If count drops to zero, call inactive routine and return to freelist. @@ -1336,7 +1326,6 @@ vrele(vp) if (vp->v_usecount == 1) { - vfs_object_destroy(vp); vp->v_usecount--; if (VSHOULDFREE(vp)) vfree(vp); @@ -1381,7 +1370,6 @@ vput(vp) if (vp->v_usecount == 1) { - vfs_object_destroy(vp); vp->v_usecount--; if (VSHOULDFREE(vp)) vfree(vp); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index a5258d8..867cf88 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $Id: vfs_subr.c,v 1.164 1998/10/12 20:14:09 dt Exp $ + * $Id: vfs_subr.c,v 1.165 1998/10/13 08:24:41 dg Exp $ */ /* @@ -81,7 +81,6 @@ static void printlockedvnodes __P((void)); static void vclean __P((struct vnode *vp, int flags, struct proc *p)); static void vfree __P((struct vnode *)); static void vgonel __P((struct vnode *vp, struct proc *p)); -static __inline void vfs_object_destroy __P((struct vnode *)); static unsigned long numvnodes; SYSCTL_INT(_debug, OID_AUTO, numvnodes, CTLFLAG_RD, &numvnodes, 0, ""); @@ -1301,15 +1300,6 @@ vref(struct vnode *vp) simple_unlock(&vp->v_interlock); } -static __inline void -vfs_object_destroy(vp) - struct vnode* vp; -{ - if (vp->v_type == VBLK && vp->v_object != NULL && - vp->v_object->ref_count == 0) - vm_object_terminate(vp->v_object); -} - /* * Vnode put/release. * If count drops to zero, call inactive routine and return to freelist. @@ -1336,7 +1326,6 @@ vrele(vp) if (vp->v_usecount == 1) { - vfs_object_destroy(vp); vp->v_usecount--; if (VSHOULDFREE(vp)) vfree(vp); @@ -1381,7 +1370,6 @@ vput(vp) if (vp->v_usecount == 1) { - vfs_object_destroy(vp); vp->v_usecount--; if (VSHOULDFREE(vp)) vfree(vp); |
