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

Since we do not support forceful unmount of DEVFS we can do away with

Browse Source 
the partially implemented vnode-readoption code in vgonechrl().
This commit is contained in:
Poul-Henning Kamp 2005-01-04 08:49:14 +00:00
parent 59f69ba49f
commit 0b3e4fe239
1 changed files with 3 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sys/kern/vfs_subr.c
View File

@ -89,7 +89,6 @@ static void syncer_shutdown(void *arg, int howto);
static int vtryrecycle(struct vnode *vp);
static void vx_lock(struct vnode *vp);
static void vx_unlock(struct vnode *vp);
static void vgonechrl(struct vnode *vp, struct thread *td);
/*
@ -2125,10 +2124,9 @@ loop:
* all other files, just kill them.
*/
if (flags & FORCECLOSE) {
if (vp->v_type != VCHR)
vgonel(vp, td);
else
vgonechrl(vp, td);
KASSERT(vp->v_type != VCHR && vp->v_type != VBLK,
("device VNODE %p is FORCECLOSED", vp));
vgonel(vp, td);
MNT_ILOCK(mp);
continue;
}
@ -2367,46 +2365,6 @@ 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);
/*
* This is a custom version of vclean() which does not tearm down
* the bufs or vm objects held by this vnode. This allows filesystems
* to continue using devices which were discovered via another
* filesystem that has been unmounted.
*/
if (vp->v_usecount != 0) {
v_incr_usecount(vp, 1);
/*
* Ensure that no other activity can occur while the
* underlying object is being cleaned out.
*/
VOP_LOCK(vp, LK_DRAIN | LK_INTERLOCK, td);
/*
* Any other processes trying to obtain this lock must first
* wait for VXLOCK to clear, then call the new lock operation.
*/
VOP_UNLOCK(vp, 0, td);
vp->v_vnlock = &vp->v_lock;
vp->v_tag = "orphanchr";
delmntque(vp);
cache_purge(vp);
vrele(vp);
VI_LOCK(vp);
} else
vclean(vp, 0, td);
vx_unlock(vp);
VI_UNLOCK(vp);
}
/*
* vgone, with the vp interlock held.
*/