system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-19 06:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Move the xlock 'locking' code into vx_lock() and vx_unlock().

Browse source 
- Create a new function, vgonechrl(), which performs vgone for an in-use
   character device.  Move the code from vflush() that did this into
   vgonechrl().
 - Hold the xlock across the entirety of vgonel() and vgonechrl() so that
   at no point will an invalid vnode exist on any list without XLOCK set.
 - Move the xlock code out of vclean() now that it is in the vgone*()
   functions.
This commit is contained in:
Jeff Roberson 2003-10-05 00:02:41 +00:00
parent 6caf7e9fa4
commit 894fbf9769
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=120771
1 changed files with 54 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
sys/kern/vfs_subr.c
View file

@ -86,6 +86,9 @@ static void vlruvp(struct vnode *vp);
static int flushbuflist(struct buf *blist, int flags, struct vnode *vp,
int slpflag, int slptimeo, int *errorp);
static int vcanrecycle(struct vnode *vp, struct mount **vnmpp);
static void vx_lock(struct vnode *vp);
static void vx_unlock(struct vnode *vp);
static void vgonechrl(struct vnode *vp, struct thread *td);
/*
@ -2426,14 +2429,10 @@ vflush(mp, rootrefs, flags)
* all other files, just kill them.
*/
if (flags & FORCECLOSE) {
if (vp->v_type != VCHR) {
if (vp->v_type != VCHR)
vgonel(vp, td);
} else {
vclean(vp, 0, td);
VI_UNLOCK(vp);
vp->v_op = spec_vnodeop_p;
insmntque(vp, (struct mount *) 0);
}
else
vgonechrl(vp, td);
mtx_lock(&mntvnode_mtx);
continue;
}
@ -2488,6 +2487,34 @@ vlruvp(struct vnode *vp)
#endif
}
static void
vx_lock(struct vnode *vp)
{
ASSERT_VI_LOCKED(vp, "vx_lock");
/*
* Prevent the vnode from being recycled or brought into use while we
* clean it out.
*/
if (vp->v_iflag & VI_XLOCK)
panic("vclean: deadlock");
vp->v_iflag |= VI_XLOCK;
vp->v_vxproc = curthread;
}
static void
vx_unlock(struct vnode *vp)
{
ASSERT_VI_LOCKED(vp, "vx_unlock");
vp->v_iflag &= ~VI_XLOCK;
vp->v_vxproc = NULL;
if (vp->v_iflag & VI_XWANT) {
vp->v_iflag &= ~VI_XWANT;
wakeup(vp);
}
}
/*
* Disassociate the underlying filesystem from a vnode.
*/
@ -2508,14 +2535,6 @@ vclean(vp, flags, td)
if ((active = vp->v_usecount))
v_incr_usecount(vp, 1);
/*
* Prevent the vnode from being recycled or brought into use while we
* clean it out.
*/
if (vp->v_iflag & VI_XLOCK)
panic("vclean: deadlock");
vp->v_iflag |= VI_XLOCK;
vp->v_vxproc = curthread;
/*
* Even if the count is zero, the VOP_INACTIVE routine may still
* have the object locked while it cleans it out. The VOP_LOCK
@ -2609,12 +2628,6 @@ vclean(vp, flags, td)
if (vp->v_pollinfo != NULL)
vn_pollgone(vp);
vp->v_tag = "none";
vp->v_iflag &= ~VI_XLOCK;
vp->v_vxproc = NULL;
if (vp->v_iflag & VI_XWANT) {
vp->v_iflag &= ~VI_XWANT;
wakeup(vp);
}
}
/*
@ -2696,6 +2709,24 @@ vgone(vp)
vgonel(vp, td);
}
/*
* Disassociate a character device from the its underlying filesystem and
* attach it to spec. This is for use when the chr device is still active
* and the filesystem is going away.
*/
static void
vgonechrl(struct vnode *vp, struct thread *td)
{
ASSERT_VI_LOCKED(vp, "vgonechrl");
vx_lock(vp);
vclean(vp, 0, td);
VI_UNLOCK(vp);
insmntque(vp, (struct mount *) 0);
VI_LOCK(vp);
vp->v_op = spec_vnodeop_p;
vx_unlock(vp);
VI_UNLOCK(vp);
}
/*
* vgone, with the vp interlock held.
*/
@ -2714,6 +2745,7 @@ vgonel(vp, td)
msleep(vp, VI_MTX(vp), PINOD | PDROP, "vgone", 0);
return;
}
vx_lock(vp);
/*
* Clean out the filesystem specific data.
@ -2762,6 +2794,7 @@ vgonel(vp, td)
}
vp->v_type = VBAD;
vx_unlock(vp);
VI_UNLOCK(vp);
}