svn commit: r340398 - stable/12/sys/vm

[Mark Johnston]

Author: markj
Date: Tue Nov 13 17:43:16 2018
New Revision: 340398
URL: https://svnweb.freebsd.org/changeset/base/340398

Log:
  MFC r340331:
  Re-apply r336984, reverting r339934.
  
  Approved by:	re (gjb)

Modified:
  stable/12/sys/vm/vm_object.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/vm/vm_object.c
==============================================================================
--- stable/12/sys/vm/vm_object.c	Tue Nov 13 17:25:34 2018	(r340397)
+++ stable/12/sys/vm/vm_object.c	Tue Nov 13 17:43:16 2018	(r340398)
@@ -2143,8 +2143,9 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset
 	next_size >>= PAGE_SHIFT;
 	next_pindex = OFF_TO_IDX(prev_offset) + prev_size;
 
-	if ((prev_object->ref_count > 1) &&
-	    (prev_object->size != next_pindex)) {
+	if (prev_object->ref_count > 1 &&
+	    prev_object->size != next_pindex &&
+	    (prev_object->flags & OBJ_ONEMAPPING) == 0) {
 		VM_OBJECT_WUNLOCK(prev_object);
 		return (FALSE);
 	}