From owner-p4-projects@FreeBSD.ORG  Mon Jan 10 13:04:13 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5D5151065679; Mon, 10 Jan 2011 13:04:13 +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 156A71065673
	for <perforce@freebsd.org>; Mon, 10 Jan 2011 13:04:13 +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 02BF08FC17
	for <perforce@freebsd.org>; Mon, 10 Jan 2011 13:04:13 +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 p0AD4CNw069273
	for <perforce@freebsd.org>; Mon, 10 Jan 2011 13:04:12 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0AD4CcN069270
	for perforce@freebsd.org; Mon, 10 Jan 2011 13:04:12 GMT
	(envelope-from trasz@freebsd.org)
Date: Mon, 10 Jan 2011 13:04:12 GMT
Message-Id: <201101101304.p0AD4CcN069270@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 187657 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: Mon, 10 Jan 2011 13:04:13 -0000

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

Change 187657 by trasz@trasz_victim on 2011/01/10 13:03:54

	Fix assertion.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#50 edit

Differences ...

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

@@ -211,8 +211,12 @@
 		}
 		if (container_resource_reclaimable(i)) {
 			dest->c_resources[i] -= src->c_resources[i];
-			if (dest->c_resources[i] < 0)
+			if (dest->c_resources[i] < 0) {
+				KASSERT(container_resource_sloppy(i) ||
+				    container_resource_dampened(i),
+				    ("container_sub: usage < 0"));
 				dest->c_resources[i] = 0;
+			}
 		}
 	}
 }