From owner-svn-src-user@FreeBSD.ORG  Thu Jul  2 20:52:23 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8E3C2106564A;
	Thu,  2 Jul 2009 20:52:23 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7D3818FC14;
	Thu,  2 Jul 2009 20:52:23 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n62KqNkx054556;
	Thu, 2 Jul 2009 20:52:23 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n62KqNlu054554;
	Thu, 2 Jul 2009 20:52:23 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200907022052.n62KqNlu054554@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 2 Jul 2009 20:52:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195297 - user/kmacy/releng_7_2_fcs/sys/vm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Jul 2009 20:52:23 -0000

Author: kmacy
Date: Thu Jul  2 20:52:23 2009
New Revision: 195297
URL: http://svn.freebsd.org/changeset/base/195297

Log:
  - check for page held when freeing a page terminating an object
  - assert that page's object is the same as the locked object

Modified:
  user/kmacy/releng_7_2_fcs/sys/vm/vm_object.c

Modified: user/kmacy/releng_7_2_fcs/sys/vm/vm_object.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/vm/vm_object.c	Thu Jul  2 20:05:21 2009	(r195296)
+++ user/kmacy/releng_7_2_fcs/sys/vm/vm_object.c	Thu Jul  2 20:52:23 2009	(r195297)
@@ -686,7 +686,9 @@ vm_object_terminate(vm_object_t object)
 		KASSERT(!p->busy && (p->oflags & VPO_BUSY) == 0,
 			("vm_object_terminate: freeing busy page %p "
 			"p->busy = %d, p->flags %x\n", p, p->busy, p->flags));
-		if (p->wire_count == 0) {
+		KASSERT(p->object == object,
+		    ("page object changed from %p to %p", object, p->object));
+		if (p->wire_count == 0 && p->hold_count == 0) {
 			vm_page_free(p);
 			cnt.v_pfree++;
 		} else {