From 18dbc96cbc200acd8f7f2506cd7bb022c1ecc275 Mon Sep 17 00:00:00 2001 From: kib Date: Thu, 2 Jun 2016 02:36:06 +0000 Subject: [PATCH] MFC r300756: Style. git-svn-id: svn://svn.freebsd.org/base/stable/10@301183 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/vm/vm_object.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index e9d12806e..95a9a7773 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1673,11 +1673,11 @@ vm_object_qcollapse(vm_object_t object) void vm_object_collapse(vm_object_t object) { + vm_object_t backing_object, new_backing_object; + VM_OBJECT_ASSERT_WLOCKED(object); - - while (TRUE) { - vm_object_t backing_object; + while (TRUE) { /* * Verify that the conditions are right for collapse: * @@ -1703,14 +1703,13 @@ vm_object_collapse(vm_object_t object) break; } - if ( - object->paging_in_progress != 0 || - backing_object->paging_in_progress != 0 - ) { + if (object->paging_in_progress != 0 || + backing_object->paging_in_progress != 0) { vm_object_qcollapse(object); VM_OBJECT_WUNLOCK(backing_object); break; } + /* * We know that we can either collapse the backing object (if * the parent is the only reference to it) or (perhaps) have @@ -1800,8 +1799,6 @@ vm_object_collapse(vm_object_t object) object_collapses++; } else { - vm_object_t new_backing_object; - /* * If we do not entirely shadow the backing object, * there is nothing we can do so we give up. -- 2.45.0