d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't misuse vnode interlocks in routines that can be called from interrupts.

Browse Source 
PR:		5893
This commit is contained in:
Tor Egge 1998-03-14 02:55:01 +00:00
parent 598c5bb063
commit 8293f20aee
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/vfs_export.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
* $Id: vfs_subr.c,v 1.137 1998/03/07 21:35:35 dyson Exp $
* $Id: vfs_subr.c,v 1.138 1998/03/08 09:57:15 julian Exp $
*/
/*
@ -1227,12 +1227,13 @@ void
vhold(vp)
register struct vnode *vp;
{
int s;
simple_lock(&vp->v_interlock);
s = splbio();
vp->v_holdcnt++;
if (VSHOULDBUSY(vp))
vbusy(vp);
simple_unlock(&vp->v_interlock);
splx(s);
}
/*
@ -1242,14 +1243,15 @@ void
vdrop(vp)
register struct vnode *vp;
{
int s;
simple_lock(&vp->v_interlock);
s = splbio();
if (vp->v_holdcnt <= 0)
panic("vdrop: holdcnt");
vp->v_holdcnt--;
if (VSHOULDFREE(vp))
vfree(vp);
simple_unlock(&vp->v_interlock);
splx(s);
}
/*

12
sys/kern/vfs_subr.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
* $Id: vfs_subr.c,v 1.137 1998/03/07 21:35:35 dyson Exp $
* $Id: vfs_subr.c,v 1.138 1998/03/08 09:57:15 julian Exp $
*/
/*
@ -1227,12 +1227,13 @@ void
vhold(vp)
register struct vnode *vp;
{
int s;
simple_lock(&vp->v_interlock);
s = splbio();
vp->v_holdcnt++;
if (VSHOULDBUSY(vp))
vbusy(vp);
simple_unlock(&vp->v_interlock);
splx(s);
}
/*
@ -1242,14 +1243,15 @@ void
vdrop(vp)
register struct vnode *vp;
{
int s;
simple_lock(&vp->v_interlock);
s = splbio();
if (vp->v_holdcnt <= 0)
panic("vdrop: holdcnt");
vp->v_holdcnt--;
if (VSHOULDFREE(vp))
vfree(vp);
simple_unlock(&vp->v_interlock);
splx(s);
}
/*