diff options
| author | kib <kib@FreeBSD.org> | 2006-06-08 07:55:10 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2006-06-08 07:55:10 +0000 |
| commit | 241c4b444c281d2bfae64acabb4435969895760e (patch) | |
| tree | 6f7ae5993dcff6e80bbdf804c1e67704eb5976e1 /sys | |
| parent | 6384ee914329a253d93516c22f5b2b72420685cb (diff) | |
| download | FreeBSD-src-241c4b444c281d2bfae64acabb4435969895760e.zip FreeBSD-src-241c4b444c281d2bfae64acabb4435969895760e.tar.gz | |
Fix the LOR that occurs when the MAC compiled into the kernel
and vnode is destroyed.
Reviewed by: rwatson
LOR: 189
MFC after: 2 weeks
Approved by: kan (mentor)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/vfs_subr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index da6a61b..45577ab 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -785,9 +785,6 @@ 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); @@ -799,6 +796,9 @@ 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); } |
