- 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.
This commit is contained in:
parent
d10f4f44f8
commit
c0f681c21d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=143510
@ -315,7 +315,7 @@ coda_checkunmounting(mp)
|
||||
MNT_ILOCK(mp);
|
||||
MNT_VNODE_FOREACH(vp, mp, nvp) {
|
||||
VI_LOCK(vp);
|
||||
if (vp->v_iflag & VI_XLOCK) {
|
||||
if (vp->v_iflag & VI_DOOMED) {
|
||||
VI_UNLOCK(vp);
|
||||
continue;
|
||||
}
|
||||
|
@ -315,7 +315,7 @@ coda_checkunmounting(mp)
|
||||
MNT_ILOCK(mp);
|
||||
MNT_VNODE_FOREACH(vp, mp, nvp) {
|
||||
VI_LOCK(vp);
|
||||
if (vp->v_iflag & VI_XLOCK) {
|
||||
if (vp->v_iflag & VI_DOOMED) {
|
||||
VI_UNLOCK(vp);
|
||||
continue;
|
||||
}
|
||||
|
@ -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();
|
||||
|
@ -1235,7 +1235,7 @@ nfs_vinvalbuf(struct vnode *vp, int flags, struct thread *td, int intrflg)
|
||||
* being called through vclean(). It is not clear that this is
|
||||
* unsafe.
|
||||
*/
|
||||
if (vp->v_iflag & VI_XLOCK)
|
||||
if (vp->v_iflag & VI_DOOMED)
|
||||
return (0);
|
||||
|
||||
if ((nmp->nm_flag & NFSMNT_INT) == 0)
|
||||
|
@ -802,7 +802,7 @@ nfs_clearcommit(struct mount *mp)
|
||||
MNT_ILOCK(mp);
|
||||
MNT_VNODE_FOREACH(vp, mp, nvp) {
|
||||
VI_LOCK(vp);
|
||||
if (vp->v_iflag & VI_XLOCK) {
|
||||
if (vp->v_iflag & VI_DOOMED) {
|
||||
VI_UNLOCK(vp);
|
||||
continue;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user