Author: kib
Date: Mon May 6 08:46:11 2019
New Revision: 347180
URL: https://svnweb.freebsd.org/changeset/base/347180
Log:
Noted by: alc
Reviewed by: alc, markj (previous version)
Sponsored by: The FreeBSD Foundation
MFC after: 6 days
Modified:
head/sys/vm/vm_object.c
Modified: head/sys/vm/vm_object.c
==============================================================================
--- head/sys/vm/vm_object.c Mon May 6 08:32:49 2019 (r347179)
+++ head/sys/vm/vm_object.c Mon May 6 08:46:11 2019 (r347180)
@@ -1726,9 +1726,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_NOSPLIT) != 0)) ||
- (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"
