From 0e56b01ed6ecd47900b8028cae6e77660470d18c Mon Sep 17 00:00:00 2001 From: jeff Date: Wed, 27 Apr 2005 10:03:21 +0000 Subject: - Don't vgonel() via vgone() or vrecycle() if the vnode is already doomed. This fixes forced unmounts via nullfs. Reported by: kkenn Sponsored by: Isilon Systems, Inc. --- sys/kern/vfs_subr.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 8b4d814..3c900ad 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -2199,7 +2199,7 @@ vrecycle(struct vnode *vp, struct thread *td) ASSERT_VOP_LOCKED(vp, "vrecycle"); VI_LOCK(vp); - if (vp->v_usecount == 0) { + if (vp->v_usecount == 0 && (vp->v_iflag & VI_DOOMED) == 0) { vgonel(vp, td); return (1); } @@ -2217,7 +2217,14 @@ vgone(struct vnode *vp) struct thread *td = curthread; /* XXX */ ASSERT_VOP_LOCKED(vp, "vgone"); + /* + * Don't vgonel if we're already doomed. + */ VI_LOCK(vp); + if (vp->v_iflag & VI_DOOMED) { + VI_UNLOCK(vp); + return; + } vgonel(vp, td); } -- cgit v1.1