Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Nov 2018 20:33:08 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r340331 - head/sys/vm
Message-ID:  <201811102033.wAAKX8Q9058556@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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);
 	}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811102033.wAAKX8Q9058556>