From owner-p4-projects@FreeBSD.ORG  Sat Nov 13 21:57:51 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 68C0010656C6; Sat, 13 Nov 2010 21:57:51 +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 2B32310656C3
	for <perforce@freebsd.org>; Sat, 13 Nov 2010 21:57:51 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id F12538FC1C
	for <perforce@freebsd.org>; Sat, 13 Nov 2010 21:57:50 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id oADLvoZk055797
	for <perforce@freebsd.org>; Sat, 13 Nov 2010 21:57:50 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id oADLvoNc055794
	for perforce@freebsd.org; Sat, 13 Nov 2010 21:57:50 GMT
	(envelope-from trasz@freebsd.org)
Date: Sat, 13 Nov 2010 21:57:50 GMT
Message-Id: <201011132157.oADLvoNc055794@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 185759 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 13 Nov 2010 21:57:51 -0000

http://p4web.freebsd.org/@@185759?ac=10

Change 185759 by trasz@trasz_victim on 2010/11/13 21:57:28

	I think there is nothing wrong with allowing zero amount.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#36 edit
.. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_sockbuf.c#5 edit

Differences ...

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

@@ -409,7 +409,7 @@
 
 	SDT_PROBE(container, kernel, rusage, add, p, resource, amount, 0, 0);
 
-	KASSERT(amount > 0, ("rusage_add: invalid amount for resource %d: %ju",
+	KASSERT(amount >= 0, ("rusage_add: invalid amount for resource %d: %ju",
 	    resource, amount));
 
 	mtx_lock(&container_lock);
@@ -437,7 +437,7 @@
 
 	SDT_PROBE(container, kernel, rusage, add_cred, cred, resource, amount, 0, 0);
 
-	KASSERT(amount > 0, ("rusage_add_cred: invalid amount for resource %d: %ju",
+	KASSERT(amount >= 0, ("rusage_add_cred: invalid amount for resource %d: %ju",
 	    resource, amount));
 	KASSERT(container_resource_sloppy(resource),
 	    ("rusage_add_cred: called for non-sloppy resource %d", resource));
@@ -462,7 +462,7 @@
 
 	SDT_PROBE(container, kernel, rusage, add_force, p, resource, amount, 0, 0);
 
-	KASSERT(amount > 0, ("rusage_add_force: invalid amount for resource %d: %ju",
+	KASSERT(amount >= 0, ("rusage_add_force: invalid amount for resource %d: %ju",
 	    resource, amount));
 
 	mtx_lock(&container_lock);
@@ -553,7 +553,7 @@
 
 	SDT_PROBE(container, kernel, rusage, sub, p, resource, amount, 0, 0);
 
-	KASSERT(amount > 0, ("rusage_sub: invalid amount for resource %d: %ju",
+	KASSERT(amount >= 0, ("rusage_sub: invalid amount for resource %d: %ju",
 	    resource, amount));
 	KASSERT(container_resource_reclaimable(resource),
 	    ("rusage_sub: called for non-reclaimable resource %d", resource));
@@ -577,7 +577,7 @@
 
 	SDT_PROBE(container, kernel, rusage, sub_cred, cred, resource, amount, 0, 0);
 
-	KASSERT(amount > 0, ("rusage_sub_cred: invalid amount for resource %d: %ju",
+	KASSERT(amount >= 0, ("rusage_sub_cred: invalid amount for resource %d: %ju",
 	    resource, amount));
 	KASSERT(container_resource_reclaimable(resource),
 	    ("rusage_sub_cred: called for non-reclaimable resource %d", resource));

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

@@ -354,8 +354,7 @@
 
 	sbflush_internal(sb);
 #ifdef CONTAINERS
-	if (sb->sb_hiwat != 0)
-		rusage_sub_cred(so->so_cred, RUSAGE_SBSIZE, sb->sb_hiwat);
+	rusage_sub_cred(so->so_cred, RUSAGE_SBSIZE, sb->sb_hiwat);
 #endif
 	(void)chgsbsize(so->so_cred->cr_uidinfo, &sb->sb_hiwat, 0,
 	    RLIM_INFINITY);