From owner-p4-projects@FreeBSD.ORG  Fri Jul 28 11:09:19 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 AA12A16A4E1; Fri, 28 Jul 2006 11:09:19 +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 8681916A4DF
	for <perforce@FreeBSD.org>; Fri, 28 Jul 2006 11:09:19 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 541DA43D46
	for <perforce@FreeBSD.org>; Fri, 28 Jul 2006 11:09:19 +0000 (GMT)
	(envelope-from rdivacky@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 k6SB9Jn4019263
	for <perforce@FreeBSD.org>; Fri, 28 Jul 2006 11:09:19 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SB9Ihc019260
	for perforce@freebsd.org; Fri, 28 Jul 2006 11:09:18 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Fri, 28 Jul 2006 11:09:18 GMT
Message-Id: <200607281109.k6SB9Ihc019260@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 102642 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: Fri, 28 Jul 2006 11:09:19 -0000

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

Change 102642 by rdivacky@rdivacky_witten on 2006/07/28 11:08:20

	Fix the linux_getppid() to not panic immediately.

Affected files ...

.. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#5 edit

Differences ...

==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#5 (text+ko) ====

@@ -1330,8 +1330,6 @@
  * linux_getuid() - MP SAFE
  */
 
-/* XXX: getppid must be changed too */
-
 int
 linux_getpid(struct thread *td, struct linux_getpid_args *args)
 {
@@ -1382,20 +1380,20 @@
 	PROC_LOCK(pp);
 	PROC_UNLOCK(p);
 
-	em = em_find(pp->p_pid, EMUL_UNLOCKED);
-
-	if (em == NULL) {
+	/* if its also linux process */
+	if (pp->p_sysent == &elf_linux_sysvec) {
+   	   	em = em_find(pp->p_pid, EMUL_LOCKED);
+   		if (em == NULL) {
+   		   	printf("this happens!\n");
 #ifdef	DEBUG
-		printf(LMSG("emuldata not found.\n"));
+			printf(LMSG("emuldata not found.\n"));
 #endif
-		EMUL_RUNLOCK(&emul_lock);
-		return (0);
-	}
-
-	/* if its also linux process */
-	if (pp->p_sysent == &elf_linux_sysvec)
+			PROC_UNLOCK(pp);
+			EMUL_RUNLOCK(&emul_lock);
+			return (0);
+		}
 	   	td->td_retval[0] = em->shared->group_pid;
-	else
+	} else
 	   	td->td_retval[0] = pp->p_pid;
 
 	EMUL_RUNLOCK(&emul_lock);