From owner-p4-projects@FreeBSD.ORG  Thu Aug  3 09:55:33 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 206FC16A4DF; Thu,  3 Aug 2006 09:55:33 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D24FA16A4DD
	for <perforce@FreeBSD.org>; Thu,  3 Aug 2006 09:55:32 +0000 (UTC)
	(envelope-from cdjones@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 913B343D46
	for <perforce@FreeBSD.org>; Thu,  3 Aug 2006 09:55:32 +0000 (GMT)
	(envelope-from cdjones@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k739tWj4007057
	for <perforce@FreeBSD.org>; Thu, 3 Aug 2006 09:55:32 GMT
	(envelope-from cdjones@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k739tWgQ007054
	for perforce@freebsd.org; Thu, 3 Aug 2006 09:55:32 GMT
	(envelope-from cdjones@FreeBSD.org)
Date: Thu, 3 Aug 2006 09:55:32 GMT
Message-Id: <200608030955.k739tWgQ007054@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cdjones@FreeBSD.org using -f
From: Chris Jones <cdjones@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 103110 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Thu, 03 Aug 2006 09:55:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=103110

Change 103110 by cdjones@cdjones-impulse on 2006/08/03 09:55:12

	Same as before; panics with WITNESS.  Whee.

Affected files ...

.. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#20 edit

Differences ...

==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#20 (text+ko) ====

@@ -144,8 +144,6 @@
     if (flags & J_PAGER_TD_DIE)
       break;
 
-    mtx_lock(&pr->pr_mtx);
-
     /* TODO: consider whether it might be better to start
      * pushing back when we approach the limit, rather than
      * when we hit it.
@@ -220,7 +218,6 @@
       } /* end LIST_FOREACH procs */
       sx_sunlock(&allproc_lock);
     }
-    mtx_unlock(&pr->pr_mtx);
     
     /* TODO --- make interval into a sysctl. */
     /* 6 seconds because VM recomputes totals every 5. */
@@ -432,16 +429,14 @@
 	mtx_lock(&pr->pr_mtx);
 	pr->pr_ref--;
 	if (pr->pr_ref == 0) {
-	        *pr->pr_scheduler_flags_ptr = J_SCHED_TD_DIE;
-		kthread_resume(pr->pr_scheduler);
-		*pr->pr_pager_flags_ptr = J_PAGER_TD_DIE;
-		kthread_resume(pr->pr_pager);
-
 		LIST_REMOVE(pr, pr_list);
 		mtx_unlock(&pr->pr_mtx);
 		prisoncount--;
 		mtx_unlock(&allprison_mtx);
 
+                /* Tell scheduler, pager to die.  No need to wait. */
+	        *pr->pr_scheduler_flags_ptr = J_SCHED_TD_DIE;
+		*pr->pr_pager_flags_ptr = J_PAGER_TD_DIE;
 		wakeup(pr);
 
 		TASK_INIT(&pr->pr_task, 0, prison_complete, pr);