From owner-svn-src-all@FreeBSD.ORG  Sun Nov 25 19:31:42 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E9C0EDD2;
 Sun, 25 Nov 2012 19:31:42 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CD8148FC08;
 Sun, 25 Nov 2012 19:31:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAPJVgaA015467;
 Sun, 25 Nov 2012 19:31:42 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAPJVgSA015466;
 Sun, 25 Nov 2012 19:31:42 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201211251931.qAPJVgSA015466@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 25 Nov 2012 19:31:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243528 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Nov 2012 19:31:43 -0000

Author: pjd
Date: Sun Nov 25 19:31:42 2012
New Revision: 243528
URL: http://svnweb.freebsd.org/changeset/base/243528

Log:
  Look for zombie process only if we were given process id.
  
  Reviewed by:	kib
  MFC after:	2 weeks
  X-MFC-after-or-with:	243142

Modified:
  head/sys/kern/kern_proc.c

Modified: head/sys/kern/kern_proc.c
==============================================================================
--- head/sys/kern/kern_proc.c	Sun Nov 25 19:10:53 2012	(r243527)
+++ head/sys/kern/kern_proc.c	Sun Nov 25 19:31:42 2012	(r243528)
@@ -375,14 +375,15 @@ pget(pid_t pid, int flags, struct proc *
 	int error;
 
 	sx_slock(&allproc_lock);
-	if (pid <= PID_MAX)
+	if (pid <= PID_MAX) {
 		p = pfind_locked(pid);
-	else if ((flags & PGET_NOTID) == 0)
+		if (p == NULL && (flags & PGET_NOTWEXIT) == 0)
+			p = zpfind_locked(pid);
+	} else if ((flags & PGET_NOTID) == 0) {
 		p = pfind_tid_locked(pid);
-	else
+	} else {
 		p = NULL;
-	if (p == NULL && (flags & PGET_NOTWEXIT) == 0)
-		p = zpfind_locked(pid);
+	}
 	sx_sunlock(&allproc_lock);
 	if (p == NULL)
 		return (ESRCH);