Author: kib
Date: Sun Oct 21 00:11:56 2018
New Revision: 339508
URL: https://svnweb.freebsd.org/changeset/base/339508

Log:
  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

Modified:
  head/sys/vm/vm_map.c

Modified: head/sys/vm/vm_map.c
==============================================================================
--- head/sys/vm/vm_map.c        Sat Oct 20 23:17:24 2018        (r339507)
+++ head/sys/vm/vm_map.c        Sun Oct 21 00:11:56 2018        (r339508)
@@ -1708,25 +1708,23 @@ vm_map_simplify_entry(vm_map_t map, vm_map_entry_t ent
                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);
        }
 }
 /*
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to