svn commit: r339202 - stable/11/sys/vm

[Konstantin Belousov]

Author: kib
Date: Fri Oct  5 18:12:49 2018
New Revision: 339202
URL: https://svnweb.freebsd.org/changeset/base/339202

Log:
  MFC r338997:
  In vm_fault_copy_entry(), collect the code to initialize a newly
  allocated dst_object in a single place.

Modified:
  stable/11/sys/vm/vm_fault.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/vm/vm_fault.c
==============================================================================
--- stable/11/sys/vm/vm_fault.c	Fri Oct  5 17:53:47 2018	(r339201)
+++ stable/11/sys/vm/vm_fault.c	Fri Oct  5 18:12:49 2018	(r339202)
@@ -1606,6 +1606,7 @@ vm_fault_copy_entry(vm_map_t dst_map, vm_map_t src_map
 		dst_object->flags |= OBJ_COLORED;
 		dst_object->pg_color = atop(dst_entry->start);
 #endif
+		dst_object->charge = dst_entry->end - dst_entry->start;
 	}
 
 	VM_OBJECT_WLOCK(dst_object);
@@ -1614,7 +1615,6 @@ vm_fault_copy_entry(vm_map_t dst_map, vm_map_t src_map
 	if (src_object != dst_object) {
 		dst_entry->object.vm_object = dst_object;
 		dst_entry->offset = 0;
-		dst_object->charge = dst_entry->end - dst_entry->start;
 	}
 	if (fork_charge != NULL) {
 		KASSERT(dst_entry->cred == NULL,