diff options
author | kib <kib@FreeBSD.org> | 2016-06-02 02:36:06 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2016-06-02 02:36:06 +0000 |
commit | 649b4008dde9927d5fdeb2d50853c68d2bb7abb4 (patch) | |
tree | 7ba5c751e25ef4c1d99409a65e7b3c35cb63d740 /sys/vm/vm_object.c | |
parent | 82d837313043527a3b79918dff7946c4eb7f51b3 (diff) | |
download | FreeBSD-src-649b4008dde9927d5fdeb2d50853c68d2bb7abb4.zip FreeBSD-src-649b4008dde9927d5fdeb2d50853c68d2bb7abb4.tar.gz |
MFC r300756:
Style.
Diffstat (limited to 'sys/vm/vm_object.c')
-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 e9d1280..95a9a77 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. |