From owner-p4-projects@FreeBSD.ORG  Tue Aug 21 23:51:45 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1032E16A469; Tue, 21 Aug 2007 23:51:45 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D950B16A418
	for <perforce@FreeBSD.org>; Tue, 21 Aug 2007 23:51:44 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C677513C4CB
	for <perforce@FreeBSD.org>; Tue, 21 Aug 2007 23:51:44 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7LNpism006483
	for <perforce@FreeBSD.org>; Tue, 21 Aug 2007 23:51:44 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7LNpi6Q006480
	for perforce@freebsd.org; Tue, 21 Aug 2007 23:51:44 GMT
	(envelope-from zec@FreeBSD.org)
Date: Tue, 21 Aug 2007 23:51:44 GMT
Message-Id: <200708212351.l7LNpi6Q006480@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 125520 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, 21 Aug 2007 23:51:45 -0000

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

Change 125520 by zec@zec_tpx32 on 2007/08/21 23:51:39

	Given that ng_pipe nodes can be connected into arbitrary
	topologies, and therefore it is possible for ngp_rcvdata()
	to be recursively called from a single thread, it is
	necessary to explicitly allow for the ng_pipe_giant mutex
	to be recursively acquireable.

Affected files ...

.. //depot/projects/vimage/src/sys/netgraph/ng_pipe.c#2 edit

Differences ...

==== //depot/projects/vimage/src/sys/netgraph/ng_pipe.c#2 (text+ko) ====

@@ -1028,7 +1028,7 @@
 			error = EEXIST; 
 		else {
 			mtx_init(&ng_pipe_giant, "ng_pipe_giant", NULL,
-			    MTX_DEF);
+			    MTX_DEF | MTX_RECURSE);
 			LIST_INIT(&node_head);
 			LIST_INIT(&hook_head);
 			ds_handle = timeout((timeout_t *) &pipe_scheduler,