svn commit: r340331 - head/sys/vm

[Mark Johnston]

Author: markj
Date: Sat Nov 10 20:33:08 2018
New Revision: 340331
URL: https://svnweb.freebsd.org/changeset/base/340331

Log:
  Re-apply r336984, reverting r339934.
  
  r336984 exposed the bug fixed in r340241, leading to the initial revert
  while the bug was being hunted down.  Now that the bug is fixed, we
  can revert the revert.
  
  Discussed with:	alc
  MFC after:	3 days

Modified:
  head/sys/vm/vm_object.c

Modified: head/sys/vm/vm_object.c
==============================================================================
--- head/sys/vm/vm_object.c	Sat Nov 10 20:26:55 2018	(r340330)
+++ head/sys/vm/vm_object.c	Sat Nov 10 20:33:08 2018	(r340331)
@@ -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);
 	}