- Remove vm_object_init2(). It is unused.

 - Add a mtx_destroy() to vm_object_collapse().  (This allows a bzero()
   to migrate from _vm_object_allocate() to vm_object_zinit(), where it
   will be performed less often.)

1 files changed, 3 insertions, 6 deletions

diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 5ccf4a6..ae26d19 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -180,6 +180,7 @@ vm_object_zinit(void *mem, int size)
 	vm_object_t object;
 
 	object = (vm_object_t)mem;
+	bzero(&object->mtx, sizeof(object->mtx));
 
 	/* These are true for any object that has been freed */
 	object->paging_in_progress = 0;
@@ -192,7 +193,6 @@ _vm_object_allocate(objtype_t type, vm_pindex_t size, vm_object_t object)
 {
 	int incr;
 
-	bzero(&object->mtx, sizeof(object->mtx));
 	mtx_init(&object->mtx, "vm object", NULL, MTX_DEF);
 
 	TAILQ_INIT(&object->memq);
@@ -253,11 +253,6 @@ vm_object_init(void)
 }
 
 void
-vm_object_init2(void)
-{
-}
-
-void
 vm_object_set_flag(vm_object_t object, u_short bits)
 {
 	object->flags |= bits;
@@ -1630,6 +1625,8 @@ vm_object_collapse(vm_object_t object)
 			);
 			mtx_unlock(&vm_object_list_mtx);
 
+			mtx_destroy(&backing_object->mtx);
+
 			uma_zfree(obj_zone, backing_object);
 
 			object_collapses++;