svn commit: r347180 - head/sys/vm

[Konstantin Belousov]

On Mon, May 06, 2019 at 08:46:12AM +0000, Konstantin Belousov wrote:
> Author: kib
> Date: Mon May  6 08:46:11 2019
> New Revision: 347180
> URL: https://svnweb.freebsd.org/changeset/base/347180
> 
The commit message should include some text like this:

Include OBJT_DEFAULT objects in the fix from r347150.

Default objects can legitimately have OBJ_NOSPLIT flag set, e.g. POSIX shm.
And collapse must be avoided for them same as for the swap objects.

> 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) ||