From owner-p4-projects@FreeBSD.ORG  Tue Feb  6 22:50:31 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 409C816A40D; Tue,  6 Feb 2007 22:50:28 +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 1333016A408
	for <perforce@freebsd.org>; Tue,  6 Feb 2007 22:50:27 +0000 (UTC)
	(envelope-from xdivac02@stud.fit.vutbr.cz)
Received: from eva.fit.vutbr.cz (eva.fit.vutbr.cz [147.229.176.14])
	by mx1.freebsd.org (Postfix) with ESMTP id 6768F13C481
	for <perforce@freebsd.org>; Tue,  6 Feb 2007 22:50:21 +0000 (UTC)
	(envelope-from xdivac02@stud.fit.vutbr.cz)
Received: from eva.fit.vutbr.cz (localhost [127.0.0.1])
	by eva.fit.vutbr.cz (envelope-from xdivac02@eva.fit.vutbr.cz)
	(8.13.8/8.13.7) with ESMTP id l16MoJ8Q088273
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <perforce@freebsd.org>; Tue, 6 Feb 2007 23:50:19 +0100 (CET)
Received: (from xdivac02@localhost)
	by eva.fit.vutbr.cz (8.13.8/8.13.3/Submit) id l16MoJWq088272
	for perforce@freebsd.org; Tue, 6 Feb 2007 23:50:19 +0100 (CET)
Date: Tue, 6 Feb 2007 23:50:19 +0100
From: Divacky Roman <xdivac02@stud.fit.vutbr.cz>
To: Perforce Change Reviews <perforce@freebsd.org>
Message-ID: <20070206225019.GA88194@stud.fit.vutbr.cz>
References: <200702062243.l16MhT15091135@repoman.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200702062243.l16MhT15091135@repoman.freebsd.org>
User-Agent: Mutt/1.4.2.2i
X-Scanned-By: MIMEDefang 2.57 on 147.229.176.14
Cc: 
Subject: Re: 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:50:31 -0000

On Tue, Feb 06, 2007 at 10:43:29PM +0000, Roman Divacky wrote:
> 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);
>  
> 

grrrr.. I accidentally commited the fix for the LOR caused by holding 2 sx locks
(emul_lock and proctree_lock).