From owner-p4-projects@FreeBSD.ORG Tue Aug 15 15:30:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04D8D16A4FF; Tue, 15 Aug 2006 15:30:25 +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 D465116A4FD; Tue, 15 Aug 2006 15:30:24 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D8DD43D46; Tue, 15 Aug 2006 15:30:24 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k7FFUMxo028219; Tue, 15 Aug 2006 11:30:22 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Tue, 15 Aug 2006 11:24:05 -0400 User-Agent: KMail/1.9.1 References: <200608151354.k7FDs1Vn093614@repoman.freebsd.org> In-Reply-To: <200608151354.k7FDs1Vn093614@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200608151124.05472.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Tue, 15 Aug 2006 11:30:22 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/1663/Tue Aug 15 09:08:37 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 104026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 15:30:25 -0000 On Tuesday 15 August 2006 09:54, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=104026 > > Change 104026 by rdivacky@rdivacky_witten on 2006/08/15 13:53:34 > > Lock the emuldata in a case we just created it. > > Pointed out by: jhb > > Affected files ... > > .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#7 edit > > Differences ... > > ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#7 (text+ko) ==== > > @@ -100,6 +100,7 @@ > if (p == NULL) > panic("process not found in proc_init\n"); > p->p_emuldata = em; > + EMUL_LOCK(&emul_lock); > PROC_UNLOCK(p); > } else { > /* lookup the old one */ Actually, this won't be happy since emul_lock is an sx lock. Can't acquire an sx lock while holding a mutex since the sx lock might sleep. > @@ -129,6 +130,7 @@ > > > if (child != 0) { > + EMUL_UNLOCK(&emul_lock); > EMUL_SHARED_WLOCK(&emul_shared_lock); > LIST_INSERT_HEAD(&em->shared->threads, em, threads); > EMUL_SHARED_WUNLOCK(&emul_shared_lock); > -- John Baldwin