From owner-svn-src-user@FreeBSD.ORG  Wed Jun 24 20:29:11 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4817D106564A;
	Wed, 24 Jun 2009 20:29:11 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 36E778FC1A;
	Wed, 24 Jun 2009 20:29:11 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5OKTBgp027968;
	Wed, 24 Jun 2009 20:29:11 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5OKTBqr027966;
	Wed, 24 Jun 2009 20:29:11 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906242029.n5OKTBqr027966@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 24 Jun 2009 20:29:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194898 - user/kmacy/releng_7_2_fcs/sys/net
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Jun 2009 20:29:11 -0000

Author: kmacy
Date: Wed Jun 24 20:29:10 2009
New Revision: 194898
URL: http://svn.freebsd.org/changeset/base/194898

Log:
  add further lock asserts

Modified:
  user/kmacy/releng_7_2_fcs/sys/net/route.h

Modified: user/kmacy/releng_7_2_fcs/sys/net/route.h
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/net/route.h	Wed Jun 24 20:22:54 2009	(r194897)
+++ user/kmacy/releng_7_2_fcs/sys/net/route.h	Wed Jun 24 20:29:10 2009	(r194898)
@@ -342,9 +342,10 @@ struct rt_addrinfo {
 } while (0)
 
 #define	RTFREE_LOCKED(_rt) do {					\
-	if ((_rt)->rt_refcnt <= 1)				\
+	RT_LOCK_ASSERT(_rt);					\
+	if ((_rt)->rt_refcnt <= 1) {				\
 		rtfree(_rt);					\
-	else {							\
+	} else {						\
 		RT_REMREF(_rt);					\
 		RT_UNLOCK(_rt);					\
 	}							\
@@ -358,6 +359,7 @@ struct rt_addrinfo {
 } while (0)
 
 #define RT_TEMP_UNLOCK(_rt) do {				\
+	RT_LOCK_ASSERT(_rt);					\
 	RT_ADDREF(_rt);						\
 	RT_UNLOCK(_rt);						\
 } while (0)