Author: kib
Date: Sun May 12 07:53:24 2019
New Revision: 347508
URL: https://svnweb.freebsd.org/changeset/base/347508
Log:
MFC r347150, r347180:
Do not collapse objects with OBJ_NOSPLIT backing swap or default object.
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 Sun May 12 07:13:25 2019
(r347507)
+++ stable/12/sys/vm/vm_object.c Sun May 12 07:53:24 2019
(r347508)
@@ -1748,8 +1748,8 @@ vm_object_collapse(vm_object_t object)
VM_OBJECT_WLOCK(backing_object);
if (backing_object->handle != NULL ||
(backing_object->type != OBJT_DEFAULT &&
- backing_object->type != OBJT_SWAP) ||
- (backing_object->flags & OBJ_DEAD) ||
+ backing_object->type != OBJT_SWAP) ||
+ (backing_object->flags & (OBJ_DEAD | OBJ_NOSPLIT)) != 0 ||
object->handle != NULL ||
(object->type != OBJT_DEFAULT &&
object->type != OBJT_SWAP) ||
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
