From c8d3bc1fa390530e1dd08a171167bcdcba113a1f Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Wed, 5 Jul 2006 16:33:25 +0000 Subject: [PATCH] Back out my rev. 1.674. The better fix (rev. 1.637) is already in tree. Approved by: kan (mentor) --- sys/kern/vfs_subr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 45577abfa50..da6a61b84bd 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -785,6 +785,9 @@ vdestroy(struct vnode *vp) VNASSERT(TAILQ_EMPTY(&vp->v_cache_dst), vp, ("vp has namecache dst")); VNASSERT(LIST_EMPTY(&vp->v_cache_src), vp, ("vp has namecache src")); VI_UNLOCK(vp); +#ifdef MAC + mac_destroy_vnode(vp); +#endif if (vp->v_pollinfo != NULL) { knlist_destroy(&vp->v_pollinfo->vpi_selinfo.si_note); mtx_destroy(&vp->v_pollinfo->vpi_lock); @@ -796,9 +799,6 @@ vdestroy(struct vnode *vp) #endif lockdestroy(vp->v_vnlock); mtx_destroy(&vp->v_interlock); -#ifdef MAC - mac_destroy_vnode(vp); -#endif uma_zfree(vnode_zone, vp); }