From owner-p4-projects@FreeBSD.ORG  Tue Feb  6 22:43:36 2007
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 E4BA716A488; Tue,  6 Feb 2007 22:43:31 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7623516A40E
	for <perforce@FreeBSD.org>; Tue,  6 Feb 2007 22:43:29 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 66A5613C48D
	for <perforce@FreeBSD.org>; Tue,  6 Feb 2007 22:43:29 +0000 (UTC)
	(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 l16MhTcM091142
	for <perforce@FreeBSD.org>; Tue, 6 Feb 2007 22:43:29 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l16MhT15091135
	for perforce@freebsd.org; Tue, 6 Feb 2007 22:43:29 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Tue, 6 Feb 2007 22:43:29 GMT
Message-Id: <200702062243.l16MhT15091135@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 114132 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: Tue, 06 Feb 2007 22:43:36 -0000

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

Change 114132 by rdivacky@rdivacky_witten on 2007/02/06 22:43:08

	Remove forgotten EMUL_UNLOCK in getppid().

Affected files ...

.. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#33 edit
.. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#55 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#33 (text+ko) ====

@@ -168,19 +168,20 @@
 
 	/* reparent all procs that are not a thread leader to initproc */
 	if (em->shared->group_pid != p->p_pid) {
-	   	sx_xlock(&proctree_lock);
-	   	wakeup(initproc);
+		child_clear_tid = em->child_clear_tid;
+		EMUL_UNLOCK(&emul_lock);
+		sx_xlock(&proctree_lock);
+		wakeup(initproc);
 		PROC_LOCK(p);
 		proc_reparent(p, initproc);
 		p->p_sigparent = SIGCHLD;
 		PROC_UNLOCK(p);
-	   	sx_xunlock(&proctree_lock);
+		sx_xunlock(&proctree_lock);
+	} else {
+		child_clear_tid = em->child_clear_tid;
+		EMUL_UNLOCK(&emul_lock);	
 	}
 
-	child_clear_tid = em->child_clear_tid;
-
-	EMUL_UNLOCK(&emul_lock);
-
 	EMUL_SHARED_WLOCK(&emul_shared_lock);
 	LIST_REMOVE(em, threads);
 

==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#55 (text+ko) ====

@@ -1502,7 +1502,6 @@
 		printf("getppid: thread group leader not found.\n");
 #endif
 		td->td_retval[0] = 1;
-		EMUL_UNLOCK(&emul_lock);
 		return (0);
 	}
 	pp = p->p_pptr;			/* switch to parent */