5 files changed, 6 insertions, 13 deletions

diff --git a/sys/coda/coda_subr.c b/sys/coda/coda_subr.c
index 99eb883e66d0b..878bd686f03fe 100644
--- a/sys/coda/coda_subr.c
+++ b/sys/coda/coda_subr.c
@@ -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;
 		}
diff --git a/sys/fs/coda/coda_subr.c b/sys/fs/coda/coda_subr.c
index 99eb883e66d0b..878bd686f03fe 100644
--- a/sys/fs/coda/coda_subr.c
+++ b/sys/fs/coda/coda_subr.c
@@ -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;
 		}
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index eef811f8180ba..0fa8e30aa1650 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();
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index f0f5d53d51e76..f8778502806b1 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -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)
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 5a23acf332dd3..4fe6ee43e4ea4 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -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;
 		}