From 98f139daef09af760484d5e85eace6806f410751 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Thu, 26 May 2016 16:51:38 +0000 Subject: [PATCH] Style changes to some most outrageous violations in vm_object_collapse(). Reviewed by: alc Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/vm/vm_object.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index cf6eda82d722..0ebecc451a79 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1669,11 +1669,11 @@ vm_object_qcollapse(vm_object_t object) void vm_object_collapse(vm_object_t object) { - VM_OBJECT_ASSERT_WLOCKED(object); - - while (TRUE) { - vm_object_t backing_object; + vm_object_t backing_object, new_backing_object; + VM_OBJECT_ASSERT_WLOCKED(object); + + while (TRUE) { /* * Verify that the conditions are right for collapse: * @@ -1699,14 +1699,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 @@ -1796,8 +1795,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.