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

[Mark Johnston]

Author: markj
Date: Tue Oct 30 23:09:04 2018
New Revision: 339935
URL: https://svnweb.freebsd.org/changeset/base/339935

Log:
  MFC r339934:
  Revert r336984.
  
  Approved by:	re (kib)

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 Oct 30 22:40:40 2018	(r339934)
+++ stable/12/sys/vm/vm_object.c	Tue Oct 30 23:09:04 2018	(r339935)
@@ -2142,9 +2142,8 @@ 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 &&
-	    (prev_object->flags & OBJ_ONEMAPPING) == 0) {
+	if ((prev_object->ref_count > 1) &&
+	    (prev_object->size != next_pindex)) {
 		VM_OBJECT_WUNLOCK(prev_object);
 		return (FALSE);
 	}