From owner-p4-projects@FreeBSD.ORG  Mon Aug 10 19:29:48 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8ABC41065709; Mon, 10 Aug 2009 19:29:47 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ED4981065675
	for <perforce@freebsd.org>; Mon, 10 Aug 2009 19:29:46 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DC56B8FC16
	for <perforce@freebsd.org>; Mon, 10 Aug 2009 19:29:46 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7AJTk1W077704
	for <perforce@freebsd.org>; Mon, 10 Aug 2009 19:29:46 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7AJTks9077702
	for perforce@freebsd.org; Mon, 10 Aug 2009 19:29:46 GMT
	(envelope-from trasz@freebsd.org)
Date: Mon, 10 Aug 2009 19:29:46 GMT
Message-Id: <200908101929.n7AJTks9077702@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 167188 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: Mon, 10 Aug 2009 19:29:49 -0000

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

Change 167188 by trasz@trasz_anger on 2009/08/10 19:29:42

	Fix a bug, enable kassert.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#54 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#20 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#54 (text+ko) ====

@@ -599,12 +599,10 @@
 #endif
 
 	mtx_lock(&hrl_lock);
-#ifdef notyet
 	KASSERT(amount <= p->p_usage.hu_resources[resource],
 	    ("hrl_free_proc: freeing %lld of %s, which is more than allocated "
 	    "%lld for %s (pid %d)", amount, hrl_resource_name(resource),
 	    p->p_usage.hu_resources[resource], p->p_comm, p->p_pid));
-#endif
 	p->p_usage.hu_resources[resource] -= amount;
 	cred = p->p_ucred;
 	cred->cr_ruidinfo->ui_usage.hu_resources[resource] -= amount;

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#20 (text+ko) ====

@@ -2266,14 +2266,11 @@
 {
 
 	(void)chgproccnt(newcred->cr_ruidinfo, -1, 0);
-	hrl_free(HRL_RESOURCE_MAXPROCESSES, 1);
 	newcred->cr_ruid = ruip->ui_uid;
 	uihold(ruip);
 	uifree(newcred->cr_ruidinfo);
 	newcred->cr_ruidinfo = ruip;
 	(void)chgproccnt(newcred->cr_ruidinfo, 1, 0);
-	/* XXX: What about the return value? */
-	hrl_alloc(HRL_RESOURCE_MAXPROCESSES, 1);
 }
 
 /*-