Backed out rev. 1.164. It caused problems on SMP.

PR:		8309
This commit is contained in:
Dmitrij Tejblum 1998-10-14 15:05:52 +00:00
parent eb49863f1b
commit f74d75a2b6
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=40349
2 changed files with 2 additions and 26 deletions

View file

@ -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);

View file

@ -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);