From owner-p4-projects@FreeBSD.ORG  Fri Jan 28 18:28:30 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8F62A10656CF; Fri, 28 Jan 2011 18:28:30 +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 5221C10656CD
	for <perforce@freebsd.org>; Fri, 28 Jan 2011 18:28:30 +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 402318FC14
	for <perforce@freebsd.org>; Fri, 28 Jan 2011 18:28:30 +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 p0SISUYh082166
	for <perforce@freebsd.org>; Fri, 28 Jan 2011 18:28:30 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0SISUhp082163
	for perforce@freebsd.org; Fri, 28 Jan 2011 18:28:30 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 28 Jan 2011 18:28:30 GMT
Message-Id: <201101281828.p0SISUhp082163@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 188272 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, 28 Jan 2011 18:28:30 -0000

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

Change 188272 by trasz@trasz_victim on 2011/01/28 18:27:45

	Remove ugly hack that stopped being useful for debugging some time
	ago and fix descriptions in a few KASSERTs.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#20 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#9 edit

Differences ...

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

@@ -684,7 +684,7 @@
 rctl_rule_acquire(struct rctl_rule *rule)
 {
 
-	KASSERT(rule->rr_refcount > 0, ("rule->rr_refcount > 0"));
+	KASSERT(rule->rr_refcount > 0, ("rule->rr_refcount <= 0"));
 
 	refcount_acquire(&rule->rr_refcount);
 }
@@ -696,7 +696,7 @@
 	
 	rule = (struct rctl_rule *)context;
 
-	KASSERT(rule->rr_refcount == 0, ("rule->rr_refcount == 0"));
+	KASSERT(rule->rr_refcount == 0, ("rule->rr_refcount != 0"));
 	
 	/*
 	 * We don't need locking here; rule is guaranteed to be inaccessible.
@@ -710,7 +710,7 @@
 rctl_rule_release(struct rctl_rule *rule)
 {
 
-	KASSERT(rule->rr_refcount > 0, ("rule->rr_refcount > 0"));
+	KASSERT(rule->rr_refcount > 0, ("rule->rr_refcount <= 0"));
 
 	if (refcount_release(&rule->rr_refcount)) {
 		/*
@@ -1656,7 +1656,7 @@
 			if (rule == NULL)
 				goto fail;
 			KASSERT(rule->rr_subject.rs_proc == parent,
-			    ("rule->rr_subject.rs_proc == parent"));
+			    ("rule->rr_subject.rs_proc != parent"));
 			rule->rr_subject.rs_proc = child;
 			error = rctl_container_add_rule_locked(child->p_container, rule);
 			rctl_rule_release(rule);

==== //depot/projects/soc2009/trasz_limits/sys/sys/rctl.h#9 (text+ko) ====

@@ -69,11 +69,7 @@
  */
 struct rctl_rule {
 	int		rr_subject_type;
-#ifdef DIAGNOSTIC
-	struct {
-#else
 	union {
-#endif
 		struct proc	*rs_proc;
 		struct uidinfo	*rs_uip;
 		struct loginclass *hr_loginclass;