From owner-p4-projects@FreeBSD.ORG  Sun Oct 23 19:45:25 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D973616A421; Sun, 23 Oct 2005 19:45:24 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B36AE16A41F
	for <perforce@freebsd.org>; Sun, 23 Oct 2005 19:45:24 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 866A743D45
	for <perforce@freebsd.org>; Sun, 23 Oct 2005 19:45:24 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9NJjO07029794
	for <perforce@freebsd.org>; Sun, 23 Oct 2005 19:45:24 GMT
	(envelope-from alc@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9NJjOad029791
	for perforce@freebsd.org; Sun, 23 Oct 2005 19:45:24 GMT
	(envelope-from alc@freebsd.org)
Date: Sun, 23 Oct 2005 19:45:24 GMT
Message-Id: <200510231945.j9NJjOad029791@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	alc@freebsd.org using -f
From: Alan Cox <alc@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 85751 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Oct 2005 19:45:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=85751

Change 85751 by alc@alc_home on 2005/10/23 19:44:24

	Assert that the object containing the page and reservation is locked
	in preempt_destroy().

Affected files ...

.. //depot/projects/superpages/src/sys/vm/vm_reserve.c#3 edit

Differences ...

==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#3 (text+ko) ====

@@ -564,6 +564,7 @@
 	reservation_t res;
 
 	KASSERT(m->reserv,("preempt_destroy: unexistant reservation"));
+	VM_OBJECT_LOCK_ASSERT(m->reserv->object, MA_OWNED);
 	if ((res = reserve_lazy_update(m)) != NULL)
 		preempt(res, 0, m);
 	KASSERT(!m->reserv,("preempt_destroy: reservation has not been destroyed properly"));