From owner-p4-projects@FreeBSD.ORG  Sun Jan 25 00:06:38 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 595851065673; Sun, 25 Jan 2009 00:06:38 +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 19A26106564A
	for <perforce@freebsd.org>; Sun, 25 Jan 2009 00:06:38 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 05F8E8FC16
	for <perforce@freebsd.org>; Sun, 25 Jan 2009 00:06:38 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0P06bBf002029
	for <perforce@freebsd.org>; Sun, 25 Jan 2009 00:06:37 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0P06b9M002027
	for perforce@freebsd.org; Sun, 25 Jan 2009 00:06:37 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 25 Jan 2009 00:06:37 GMT
Message-Id: <200901250006.n0P06b9M002027@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 156627 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: Sun, 25 Jan 2009 00:06:39 -0000

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

Change 156627 by rwatson@rwatson_freebsd_capabilities on 2009/01/25 00:05:36

	In two places I lost return() calls when breaking out
	proc_reap() from the remainder of the wait code.  Put
	them back.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#10 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#10 (text+ko) ====

@@ -745,6 +745,7 @@
 		 */
 		PROC_UNLOCK(p);
 		sx_xunlock(&proctree_lock);
+		return;
 	}
 
 	PROC_LOCK(q);
@@ -768,6 +769,7 @@
 		cv_broadcast(&p->p_pwait);
 		PROC_UNLOCK(t);
 		sx_xunlock(&proctree_lock);
+		return;
 	}
 
 	/*