Date: Mon, 6 May 2019 08:46:12 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r347180 - head/sys/vm Message-ID: <201905060846.x468kCuf072276@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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) ||
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905060846.x468kCuf072276>