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

Style changes to some most outrageous violations in vm_object_collapse().

Browse Source 
Reviewed by:	alc
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
This commit is contained in:
Konstantin Belousov 2016-05-26 16:51:38 +00:00
parent 63b2493fcf
commit 98f139daef
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/vm/vm_object.c
View File

@ -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.