diff options
| author | kib <kib@FreeBSD.org> | 2006-07-05 16:33:25 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2006-07-05 16:33:25 +0000 |
| commit | 95ef2e0daa48aacb3177579c4bfae3346afc4a64 (patch) | |
| tree | e20626c7650304930cd79578b73237316e4f900e /sys/kern | |
| parent | 93c3d5f3e68530c5ceeeacf71dc9c213eaa6c32a (diff) | |
| download | FreeBSD-src-95ef2e0daa48aacb3177579c4bfae3346afc4a64.zip FreeBSD-src-95ef2e0daa48aacb3177579c4bfae3346afc4a64.tar.gz | |
Back out my rev. 1.674. The better fix (rev. 1.637) is already in tree.
Approved by: kan (mentor)
Diffstat (limited to 'sys/kern')
| -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 45577ab..da6a61b 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); } |
