From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 13:22:12 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CC36516A4D0; Wed, 29 Oct 2003 13:22:11 -0800 (PST)
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 A315516A4CE
	for <perforce@freebsd.org>; Wed, 29 Oct 2003 13:22:11 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 256A843FCB
	for <perforce@freebsd.org>; Wed, 29 Oct 2003 13:22:11 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9TLMAXJ057281
	for <perforce@freebsd.org>; Wed, 29 Oct 2003 13:22:11 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9TLMA89057278
	for perforce@freebsd.org; Wed, 29 Oct 2003 13:22:10 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Wed, 29 Oct 2003 13:22:10 -0800 (PST)
Message-Id: <200310292122.h9TLMA89057278@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 40779 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 29 Oct 2003 21:22:12 -0000

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

Change 40779 by sam@sam_ebb on 2003/10/29 13:21:44

	avoid recursive lock by unlocking before calling rtrequest;
	this is a bandaid to validate the problem--a proper fix is
	more involved

Affected files ...

.. //depot/projects/netperf/sys/net/route.c#20 edit

Differences ...

==== //depot/projects/netperf/sys/net/route.c#20 (text+ko) ====

@@ -684,11 +684,12 @@
 			 */
 			rt2 = rtalloc1(dst, 0, RTF_PRCLONING);
 			if (rt2 && rt2->rt_parent) {
+				RT_UNLOCK(rt2);		/* XXX recursive lock */
 				rtrequest(RTM_DELETE,
 					  rt_key(rt2),
 					  rt2->rt_gateway,
 					  rt_mask(rt2), rt2->rt_flags, 0);
-				RTFREE_LOCKED(rt2);
+				RTFREE(rt2);
 				rn = rnh->rnh_addaddr(ndst, netmask,
 						      rnh, rt->rt_nodes);
 			} else if (rt2) {