d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminiate code duplication by calling vm_object_destroy()

Browse Source 
from vm_object_collapse().

Requested and reviewed by:	alc
Approved by:	re (kensmith)
This commit is contained in:
kib 2009-06-28 08:42:17 +00:00
parent 9456008567
commit 25ffa6178c
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/vm/vm_object.c
View File

@ -1782,25 +1782,11 @@ vm_object_collapse(vm_object_t object)
* and no object references within it, all that is
* necessary is to dispose of it.
*/
if (backing_object->uip != NULL) {
swap_release_by_uid(backing_object->charge,
backing_object->uip);
backing_object->charge = 0;
uifree(backing_object->uip);
backing_object->uip = NULL;
}
KASSERT(backing_object->ref_count == 1, ("backing_object %p was somehow re-referenced during collapse!", backing_object));
KASSERT(backing_object->ref_count == 1, (
"backing_object %p was somehow re-referenced during collapse!",
backing_object));
VM_OBJECT_UNLOCK(backing_object);
mtx_lock(&vm_object_list_mtx);
TAILQ_REMOVE(
&vm_object_list,
backing_object,
object_list
);
mtx_unlock(&vm_object_list_mtx);
uma_zfree(obj_zone, backing_object);
vm_object_destroy(backing_object);
object_collapses++;
} else {