aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2005-02-07 07:48:03 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2005-02-07 07:48:03 +0000
commitb348abd6cd493b9585cae9691d0257e193e81e0d (patch)
tree9b797d9f5bbf8381aaa3d25a00203d331e614ff9 /sys
parent5937226d51342aec8daa778e611422aa8cf0a09c (diff)
downloadsrc-b348abd6cd493b9585cae9691d0257e193e81e0d.tar.gz
src-b348abd6cd493b9585cae9691d0257e193e81e0d.zip
Don't call VOP_DESTROYVOBJECT(), trust that VOP_RECLAIM() did what
was necessary.
Notes
Notes: svn path=/head/; revision=141435
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/vfs_subr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 2ac9cf270a64..c721ae236ced 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -2284,8 +2284,6 @@ vgonel(struct vnode *vp, struct thread *td)
if (vinvalbuf(vp, V_SAVE, td, 0, 0) != 0)
vinvalbuf(vp, 0, td, 0, 0);
- VOP_DESTROYVOBJECT(vp);
-
/*
* Any other processes trying to obtain this lock must first
* wait for VXLOCK to clear, then call the new lock operation.
@@ -2321,6 +2319,9 @@ vgonel(struct vnode *vp, struct thread *td)
if (VOP_RECLAIM(vp, td))
panic("vclean: cannot reclaim");
+ KASSERT(vp->v_object == NULL,
+ ("vop_reclaim left v_object vp=%p, tag=%s", vp, vp->v_tag));
+
if (active) {
/*
* Inline copy of vrele() since VOP_INACTIVE