summaryrefslogtreecommitdiffstats
path: root/sys/vm
diff options
context:
space:
mode:
Diffstat (limited to 'sys/vm')
-rw-r--r--sys/vm/vm_pageout.c2
-rw-r--r--sys/vm/vnode_pager.c7
2 files changed, 8 insertions, 1 deletions
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 19edce1..723b14d 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -951,6 +951,8 @@ rescan0:
vnodes_skipped++;
goto unlock_and_continue;
}
+ KASSERT(mp != NULL,
+ ("vp %p with NULL v_mount", vp));
vm_page_unlock_queues();
vm_object_reference_locked(object);
VM_OBJECT_UNLOCK(object);
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index faa6f37..179afbf 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -250,13 +250,16 @@ static void
vnode_pager_dealloc(object)
vm_object_t object;
{
- struct vnode *vp = object->handle;
+ struct vnode *vp;
+ int refs;
+ vp = object->handle;
if (vp == NULL)
panic("vnode_pager_dealloc: pager already dealloced");
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
vm_object_pip_wait(object, "vnpdea");
+ refs = object->ref_count;
object->handle = NULL;
object->type = OBJT_DEAD;
@@ -267,6 +270,8 @@ vnode_pager_dealloc(object)
ASSERT_VOP_ELOCKED(vp, "vnode_pager_dealloc");
vp->v_object = NULL;
vp->v_vflag &= ~VV_TEXT;
+ while (refs-- > 0)
+ vunref(vp);
}
static boolean_t
OpenPOWER on IntegriCloud