svn commit: r258037 - stable/10/sys/vm

[Konstantin Belousov]

Author: kib
Date: Tue Nov 12 08:01:58 2013
New Revision: 258037
URL: http://svnweb.freebsd.org/changeset/base/258037

Log:
  MFC r257680:
  Do not coalesce if the swap object belongs to tmpfs vnode.
  
  Approved by:	re (glebius)

Modified:
  stable/10/sys/vm/vm_object.c
Directory Properties:
  stable/10/sys/   (props changed)

Modified: stable/10/sys/vm/vm_object.c
==============================================================================
--- stable/10/sys/vm/vm_object.c	Tue Nov 12 06:14:12 2013	(r258036)
+++ stable/10/sys/vm/vm_object.c	Tue Nov 12 08:01:58 2013	(r258037)
@@ -2099,8 +2099,9 @@ vm_object_coalesce(vm_object_t prev_obje
 	if (prev_object == NULL)
 		return (TRUE);
 	VM_OBJECT_WLOCK(prev_object);
-	if (prev_object->type != OBJT_DEFAULT &&
-	    prev_object->type != OBJT_SWAP) {
+	if ((prev_object->type != OBJT_DEFAULT &&
+	    prev_object->type != OBJT_SWAP) ||
+	    (prev_object->flags & OBJ_TMPFS) != 0) {
 		VM_OBJECT_WUNLOCK(prev_object);
 		return (FALSE);
 	}