From 17afd2beec6f65f67b7933f4e3f1a93c243971ba Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Sun, 21 Oct 2018 00:11:56 +0000 Subject: [PATCH] Unindent vm_map_simplify_entry() after r339506. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D17632 --- sys/vm/vm_map.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 85132715a2bb..e961dd9e4a25 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1708,25 +1708,23 @@ vm_map_simplify_entry(vm_map_t map, vm_map_entry_t entry) return; prev = entry->prev; - if (prev != &map->header) { - if (vm_map_mergeable_neighbors(prev, entry)) { - vm_map_entry_unlink(map, prev); - entry->start = prev->start; - entry->offset = prev->offset; - if (entry->prev != &map->header) - vm_map_entry_resize_free(map, entry->prev); - vm_map_merged_neighbor_dispose(map, prev); - } + if (prev != &map->header && + vm_map_mergeable_neighbors(prev, entry)) { + vm_map_entry_unlink(map, prev); + entry->start = prev->start; + entry->offset = prev->offset; + if (entry->prev != &map->header) + vm_map_entry_resize_free(map, entry->prev); + vm_map_merged_neighbor_dispose(map, prev); } next = entry->next; - if (next != &map->header) { - if (vm_map_mergeable_neighbors(entry, next)) { - vm_map_entry_unlink(map, next); - entry->end = next->end; - vm_map_entry_resize_free(map, entry); - vm_map_merged_neighbor_dispose(map, next); - } + if (next != &map->header && + vm_map_mergeable_neighbors(entry, next)) { + vm_map_entry_unlink(map, next); + entry->end = next->end; + vm_map_entry_resize_free(map, entry); + vm_map_merged_neighbor_dispose(map, next); } } /*