From owner-p4-projects@FreeBSD.ORG  Fri Dec 24 11:20:24 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 934A11065675; Fri, 24 Dec 2010 11:20:24 +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 48D43106566C
	for <perforce@freebsd.org>; Fri, 24 Dec 2010 11:20:24 +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 365E08FC1D
	for <perforce@freebsd.org>; Fri, 24 Dec 2010 11:20:24 +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 oBOBKOtK005017
	for <perforce@freebsd.org>; Fri, 24 Dec 2010 11:20:24 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id oBOBKOxf005013
	for perforce@freebsd.org; Fri, 24 Dec 2010 11:20:24 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 24 Dec 2010 11:20:24 GMT
Message-Id: <201012241120.oBOBKOxf005013@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 187176 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: Fri, 24 Dec 2010 11:20:24 -0000

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

Change 187176 by trasz@trasz_victim on 2010/12/24 11:19:23

	Fix error handling.

Affected files ...

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

Differences ...

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

@@ -547,7 +547,13 @@
 		error = hrl_proc_fork(parent, child);
 		if (error != 0) {
 			mtx_lock(&container_lock);
-			container_destroy(&child->p_container);
+			/*
+			 * XXX: The only purpose of these two lines is to prevent from
+			 * tripping checks in container_destroy().
+			 */
+			for (i = 0; i <= RUSAGE_MAX; i++)
+				rusage_set_locked(child, i, 0);
+			container_destroy_locked(&child->p_container);
 			mtx_unlock(&container_lock);
 		}
 	}