From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 17:54:23 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A8CB716A4D1; Wed, 29 Oct 2003 17:54:23 -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 7772316A4CF
	for <perforce@freebsd.org>; Wed, 29 Oct 2003 17:54:23 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F246B43FAF
	for <perforce@freebsd.org>; Wed, 29 Oct 2003 17:54:22 -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 h9U1sMXJ077780
	for <perforce@freebsd.org>; Wed, 29 Oct 2003 17:54:22 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9U1sMgt077777
	for perforce@freebsd.org; Wed, 29 Oct 2003 17:54:22 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Wed, 29 Oct 2003 17:54:22 -0800 (PST)
Message-Id: <200310300154.h9U1sMgt077777@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 40794 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: Thu, 30 Oct 2003 01:54:24 -0000

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

Change 40794 by sam@sam_ebb on 2003/10/29 17:54:03

	conservatively expand scope of locking

Affected files ...

.. //depot/projects/netperf/sys/netinet/in_rmx.c#11 edit

Differences ...

==== //depot/projects/netperf/sys/netinet/in_rmx.c#11 (text+ko) ====

@@ -375,6 +375,7 @@
 	struct in_ifadown_arg *ap = xap;
 	struct rtentry *rt = (struct rtentry *)rn;
 
+	RT_LOCK(rt);
 	if (rt->rt_ifa == ap->ifa &&
 	    (ap->del || !(rt->rt_flags & RTF_STATIC))) {
 		/*
@@ -385,11 +386,11 @@
 		 * the routes that rtrequest() would have in any case,
 		 * so that behavior is not needed there.
 		 */
-		RT_LOCK(rt);
 		rt->rt_flags &= ~(RTF_CLONING | RTF_PRCLONING);
 		rtexpunge(rt);
 		RTFREE_LOCKED(rt);
-	}
+	} else
+		RT_UNLOCK(rt);
 	return 0;
 }