From owner-svn-src-head@FreeBSD.ORG  Mon Jul 22 02:07:16 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 531B3D99;
 Mon, 22 Jul 2013 02:07:16 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 43BD41CB6;
 Mon, 22 Jul 2013 02:07:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6M27Gvn068483;
 Mon, 22 Jul 2013 02:07:16 GMT (envelope-from mjg@svn.freebsd.org)
Received: (from mjg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6M27Gt2068482;
 Mon, 22 Jul 2013 02:07:16 GMT (envelope-from mjg@svn.freebsd.org)
Message-Id: <201307220207.r6M27Gt2068482@svn.freebsd.org>
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Mon, 22 Jul 2013 02:07:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253538 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Jul 2013 02:07:16 -0000

Author: mjg
Date: Mon Jul 22 02:07:15 2013
New Revision: 253538
URL: http://svnweb.freebsd.org/changeset/base/253538

Log:
  Remove cr_prison NULL check from proc_to_reap.
  
  Userspace processes always have a prison.
  
  MFC after:	2 weeks

Modified:
  head/sys/kern/kern_exit.c

Modified: head/sys/kern/kern_exit.c
==============================================================================
--- head/sys/kern/kern_exit.c	Mon Jul 22 00:44:37 2013	(r253537)
+++ head/sys/kern/kern_exit.c	Mon Jul 22 02:07:15 2013	(r253538)
@@ -918,8 +918,7 @@ proc_to_reap(struct thread *td, struct p
 		}
 		break;
 	case P_JAILID:
-		if (p->p_ucred->cr_prison == NULL ||
-		    (p->p_ucred->cr_prison->pr_id != (int)id)) {
+		if (p->p_ucred->cr_prison->pr_id != (int)id) {
 			PROC_UNLOCK(p);
 			return (0);
 		}