From owner-p4-projects@FreeBSD.ORG  Wed Oct 26 07:48:59 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 4B3D616A421; Wed, 26 Oct 2005 07:48:59 +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 1EF9816A41F
	for <perforce@freebsd.org>; Wed, 26 Oct 2005 07:48:59 +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 E3DFA43D48
	for <perforce@freebsd.org>; Wed, 26 Oct 2005 07:48:58 +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 j9Q7mwcS096383
	for <perforce@freebsd.org>; Wed, 26 Oct 2005 07:48:58 GMT
	(envelope-from alc@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9Q7mwP9096380
	for perforce@freebsd.org; Wed, 26 Oct 2005 07:48:58 GMT
	(envelope-from alc@freebsd.org)
Date: Wed, 26 Oct 2005 07:48:58 GMT
Message-Id: <200510260748.j9Q7mwP9096380@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 85882 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: Wed, 26 Oct 2005 07:49:00 -0000

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

Change 85882 by alc@alc_home on 2005/10/26 07:47:58

	Move an assertion to its proper place.

Affected files ...

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

Differences ...

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

@@ -315,7 +315,7 @@
 	m->reserv = res;
 	for (;;) {
 		pos = m - res->first_page;
-		KASSERT(res && pos >=0 && pos < (1 << res->order) &&
+		KASSERT(pos >= 0 && pos < (1 << res->order) &&
 				res->popfrom >= 0 && res->refcnt >= 0,
 				("reserve_populate: res invalid"));	
 		res->refcnt++;
@@ -341,6 +341,7 @@
 			reserve_procreate(res, m);
 		}
 		res = follow_child(res, IDX(m, res));
+		KASSERT(res != NULL, ("reserve_populate: missing reservation"));
 	}
 	update_maxavail(res);
 	preempt_move(m->reserv, TRUE);