From owner-p4-projects@FreeBSD.ORG  Tue Dec 28 17:54:42 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 91BDD1065695; Tue, 28 Dec 2010 17:54:42 +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 546FC106567A
	for <perforce@freebsd.org>; Tue, 28 Dec 2010 17:54:42 +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 4189F8FC14
	for <perforce@freebsd.org>; Tue, 28 Dec 2010 17:54:42 +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 oBSHsgHw096648
	for <perforce@freebsd.org>; Tue, 28 Dec 2010 17:54:42 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id oBSHsgxB096645
	for perforce@freebsd.org; Tue, 28 Dec 2010 17:54:42 GMT
	(envelope-from trasz@freebsd.org)
Date: Tue, 28 Dec 2010 17:54:42 GMT
Message-Id: <201012281754.oBSHsgxB096645@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 187257 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: Tue, 28 Dec 2010 17:54:42 -0000

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

Change 187257 by trasz@trasz_victim on 2010/12/28 17:54:17

	Jail-related fixes.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#100 edit
.. //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#2 edit

Differences ...

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

@@ -590,7 +590,6 @@
 	case HRL_SUBJECT_TYPE_JAIL:
 		if (rule->hr_subject.hs_prison != NULL) {
 			prison_free(rule->hr_subject.hs_prison);
-			sx_xunlock(&allprison_lock);
 		}
 		break;
 	default:
@@ -766,13 +765,17 @@
 			rule->hr_subject.hs_loginclass = loginclass_find(subject_idstr);
 			break;
 		case HRL_SUBJECT_TYPE_JAIL:
-			sx_xlock(&allprison_lock);
+			sx_slock(&allprison_lock);
 			rule->hr_subject.hs_prison = prison_find(id);
 			if (rule->hr_subject.hs_prison == NULL) {
-				sx_xunlock(&allprison_lock);
+				sx_sunlock(&allprison_lock);
 				error = ESRCH;
 				goto out;
 			}
+			prison_hold_locked(rule->hr_subject.hs_prison);
+			/* prison_find() returns with mutex held. */
+			mtx_unlock(&rule->hr_subject.hs_prison->pr_mtx);
+			sx_sunlock(&allprison_lock);
 			break;
                default:
                        panic("hrl_rule_from_string: unknown subject type %d",

==== //depot/projects/soc2009/trasz_limits/usr.bin/userstat/userstat.sh#2 (text+ko) ====

@@ -56,10 +56,10 @@
 n=0
 while :; do
 	if [ "`basename $0`" = "jailstat" ]; then
-		jails="`ps ax -o jid= | sort -u`"
+		jails="`ps ax -o jid= | sort -u | sed 1d`"
 		printf "JID\t%%CPU\tRSS\tVSIZE\tSWAP\n"
 		for jail in $jails; do
-			printf "$jid\t"
+			printf "$jail\t"
 			hrl $hflag -u j:$jail | format_stats
 		done