diff options
author | jeff <jeff@FreeBSD.org> | 2005-03-13 12:14:56 +0000 |
---|---|---|
committer | jeff <jeff@FreeBSD.org> | 2005-03-13 12:14:56 +0000 |
commit | 5bd51ec6e6125eed91ed13102532414e08b88d96 (patch) | |
tree | 66524027952cc29211af6953138106a47d9cf8d0 /sys/fs/devfs | |
parent | 79cf2c5860e7855a3a8a05b07c3ac0eaaa5fdc9d (diff) | |
download | FreeBSD-src-5bd51ec6e6125eed91ed13102532414e08b88d96.zip FreeBSD-src-5bd51ec6e6125eed91ed13102532414e08b88d96.tar.gz |
- The VI_DOOMED flag now signals the end of a vnode's relationship with
the filesystem. Check that rather than VI_XLOCK.
Sponsored by: Isilon Systems, Inc.
Diffstat (limited to 'sys/fs/devfs')
-rw-r--r-- | sys/fs/devfs/devfs_vnops.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index eef811f..0fa8e30 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -329,7 +329,7 @@ devfs_close(ap) if (td && vp == td->td_proc->p_session->s_ttyvp) { SESS_LOCK(td->td_proc->p_session); VI_LOCK(vp); - if (count_dev(dev) == 2 && (vp->v_iflag & VI_XLOCK) == 0) { + if (count_dev(dev) == 2 && (vp->v_iflag & VI_DOOMED) == 0) { td->td_proc->p_session->s_ttyvp = NULL; oldvp = vp; } @@ -352,7 +352,7 @@ devfs_close(ap) if (dsw == NULL) return (ENXIO); VI_LOCK(vp); - if (vp->v_iflag & VI_XLOCK) { + if (vp->v_iflag & VI_DOOMED) { /* Forced close. */ } else if (dsw->d_flags & D_TRACKCLOSE) { /* Keep device updated on status. */ @@ -1143,13 +1143,6 @@ devfs_revoke(ap) KASSERT((ap->a_flags & REVOKEALL) != 0, ("devfs_revoke !REVOKEALL")); - /* - * If a vgone (or vclean) is already in progress, - * wait until it is done and return. - */ - if (vx_wait(vp)) - return (0); - dev = vp->v_rdev; for (;;) { dev_lock(); |