PERFORCE change 190690 for review

[Edward Tomasz Napierala]

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

Change 190690 by trasz at trasz_victim on 2011/03/28 15:52:03

	Remove leftovers.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_racct.c#3 edit
.. //depot/projects/soc2009/trasz_limits/sys/sys/racct.h#4 edit

Differences ...

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

@@ -177,8 +177,7 @@
 	 * Update resource usage in dest.
 	 */
 	for (i = 0; i <= RACCT_MAX; i++) {
-		if (!racct_is_sloppy(i) &&
-		    !racct_is_dampened(i)) {
+		if (!racct_is_sloppy(i)) {
 			KASSERT(dest->r_resources[i] >= 0,
 			    ("racct propagation meltdown: dest < 0"));
 			KASSERT(src->r_resources[i] >= 0,
@@ -189,8 +188,7 @@
 		if (racct_is_reclaimable(i)) {
 			dest->r_resources[i] -= src->r_resources[i];
 			if (dest->r_resources[i] < 0) {
-				KASSERT(racct_is_sloppy(i) ||
-				    racct_is_dampened(i),
+				KASSERT(racct_is_sloppy(i),
 				    ("racct_sub_racct: usage < 0"));
 				dest->r_resources[i] = 0;
 			}
@@ -228,8 +226,6 @@
 			continue;
 		if (!racct_is_reclaimable(i))
 			continue;
-		if (racct_is_dampened(i))
-			continue;
 		KASSERT(racct->r_resources[i] == 0,
 		    ("destroying non-empty racct: "
 		    "%ju allocated for resource %d\n",
@@ -263,8 +259,7 @@
 
 	racct->r_resources[resource] += amount;
 	if (racct->r_resources[resource] < 0) {
-		KASSERT(racct_is_sloppy(resource) ||
-		    racct_is_dampened(resource),
+		KASSERT(racct_is_sloppy(resource),
 		    ("racct_alloc_resource: usage < 0"));
 		racct->r_resources[resource] = 0;
 	}

==== //depot/projects/soc2009/trasz_limits/sys/sys/racct.h#4 (text+ko) ====

@@ -80,7 +80,6 @@
 #define	RACCT_INHERITABLE	0x04
 #define	RACCT_DENIABLE		0x08
 #define	RACCT_SLOPPY		0x10
-#define	RACCT_DAMPENED		0x20
 
 extern int racct_types[];
 
@@ -116,11 +115,6 @@
 #define	racct_is_sloppy(X)		(racct_types[X] & RACCT_SLOPPY)
 
 /*
- * XXX: Explain somehow.
- */
-#define	racct_is_dampened(X)		(racct_types[X] & RACCT_DAMPENED)
-
-/*
  * The 'racct' structure defines resource consumption for a particular
  * subject, such as process or jail.
  *