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

[Konstantin Belousov]

Author: kib
Date: Sat Sep 14 13:27:07 2019
New Revision: 352322
URL: https://svnweb.freebsd.org/changeset/base/352322

Log:
  MFC r352013:
  vm_object_coalesce(): avoid extending any nosplit objects, not only
  that which back tmpfs nodes.

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	Sat Sep 14 13:25:54 2019	(r352321)
+++ stable/12/sys/vm/vm_object.c	Sat Sep 14 13:27:07 2019	(r352322)
@@ -2093,7 +2093,7 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset
 	VM_OBJECT_WLOCK(prev_object);
 	if ((prev_object->type != OBJT_DEFAULT &&
 	    prev_object->type != OBJT_SWAP) ||
-	    (prev_object->flags & OBJ_TMPFS_NODE) != 0) {
+	    (prev_object->flags & OBJ_NOSPLIT) != 0) {
 		VM_OBJECT_WUNLOCK(prev_object);
 		return (FALSE);
 	}