diff options
author | kib <kib@FreeBSD.org> | 2016-05-26 16:51:38 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2016-05-26 16:51:38 +0000 |
commit | b02e15881254f62a889c7d9607d571c92fe8ba6b (patch) | |
tree | 9d1a65e4cb29aefc2fd6b52640c1dc8934742cbe /sys/vm | |
parent | 08b577e14505aabda5d80ab62d1ac1fb2fe6303b (diff) | |
download | FreeBSD-src-b02e15881254f62a889c7d9607d571c92fe8ba6b.zip FreeBSD-src-b02e15881254f62a889c7d9607d571c92fe8ba6b.tar.gz |
Style changes to some most outrageous violations in vm_object_collapse().
Reviewed by: alc
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Diffstat (limited to 'sys/vm')
-rw-r--r-- | sys/vm/vm_object.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index cf6eda8..0ebecc4 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_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: * @@ -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. |