From owner-p4-projects@FreeBSD.ORG  Wed Aug 16 14:34:27 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 8D13A16A4E2; Wed, 16 Aug 2006 14:34:27 +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 537D116A4DA
	for <perforce@FreeBSD.org>; Wed, 16 Aug 2006 14:34:27 +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 B56C143D64
	for <perforce@FreeBSD.org>; Wed, 16 Aug 2006 14:34:25 +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 k7GEYPvk074958
	for <perforce@FreeBSD.org>; Wed, 16 Aug 2006 14:34:25 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GEYPAv074955
	for perforce@freebsd.org; Wed, 16 Aug 2006 14:34:25 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Wed, 16 Aug 2006 14:34:25 GMT
Message-Id: <200608161434.k7GEYPAv074955@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 104235 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: Wed, 16 Aug 2006 14:34:27 -0000

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

Change 104235 by rdivacky@rdivacky_witten on 2006/08/16 14:34:20

	Make ssouhlal happy and dont lock/unlock in getpid()/exit_group()

Affected files ...

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

Differences ...

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

@@ -1334,16 +1334,14 @@
    	struct linux_emuldata *em;
 	char osrel[LINUX_MAX_UTSNAME];
 
-	em = em_find(td->td_proc, EMUL_UNLOCKED);
-
-	KASSERT(em != NULL, ("getpid: emuldata not found.\n"));
-
 	linux_get_osrelease(td, osrel);
-	if (strlen(osrel) >= 3 && osrel[2] == '6')
+	if (strlen(osrel) >= 3 && osrel[2] == '6') {
+   	   	em = em_find(td->td_proc, EMUL_UNLOCKED);
+		KASSERT(em != NULL, ("getpid: emuldata not found.\n"));
    		td->td_retval[0] = em->shared->group_pid;
-	else
+		EMUL_UNLOCK(&emul_lock);
+	} else
    	   	td->td_retval[0] = td->td_proc->p_pid;
-	EMUL_UNLOCK(&emul_lock);
 	return (0);
 }
 
@@ -1475,12 +1473,11 @@
 		printf(ARGS(exit_group, "%i"), args->error_code);
 #endif
 
-	td_em = em_find(td->td_proc, EMUL_UNLOCKED);
-
-	KASSERT(td_em != NULL, ("exit_group: emuldata not found.\n"));
-
 	linux_get_osrelease(td, osrel);
 	if (strlen(osrel) >= 3 && osrel[2] == '6') {
+   	   	td_em = em_find(td->td_proc, EMUL_UNLOCKED);
+
+		KASSERT(td_em != NULL, ("exit_group: emuldata not found.\n"));
 
    		EMUL_SHARED_RLOCK(&emul_shared_lock);
      		LIST_FOREACH_SAFE(em, &td_em->shared->threads, threads, tmp_em) {
@@ -1496,8 +1493,8 @@
 		}	
 
 		EMUL_SHARED_RUNLOCK(&emul_shared_lock);
+		EMUL_UNLOCK(&emul_lock);
 	}
-	EMUL_UNLOCK(&emul_lock);
 
 	exit1(td, W_EXITCODE(args->error_code,0));