From owner-svn-src-user@FreeBSD.ORG Fri Jun 26 00:14:46 2009 Return-Path: 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 AE90F1065678; Fri, 26 Jun 2009 00:14:46 +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 9C5738FC2D; Fri, 26 Jun 2009 00:14:46 +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 n5Q0EkDv068761; Fri, 26 Jun 2009 00:14:46 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5Q0EkiE068759; Fri, 26 Jun 2009 00:14:46 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200906260014.n5Q0EkiE068759@svn.freebsd.org> From: Kip Macy Date: Fri, 26 Jun 2009 00:14:46 +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: r195017 - 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jun 2009 00:14:47 -0000 Author: kmacy Date: Fri Jun 26 00:14:46 2009 New Revision: 195017 URL: http://svn.freebsd.org/changeset/base/195017 Log: clarify panic Modified: user/kmacy/releng_7_2_fcs/sys/net/route.c Modified: user/kmacy/releng_7_2_fcs/sys/net/route.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/net/route.c Fri Jun 26 00:03:10 2009 (r195016) +++ user/kmacy/releng_7_2_fcs/sys/net/route.c Fri Jun 26 00:14:46 2009 (r195017) @@ -372,8 +372,11 @@ rtfree(struct rtentry *rt) * with the route. */ if ((rt->rt_flags & RTF_UP) == 0) { - if (rt->rt_nodes->rn_flags & (RNF_ACTIVE | RNF_ROOT)) + if (rt->rt_nodes->rn_flags & (RNF_ACTIVE | RNF_ROOT)) { + printf("rn_flags=0x%x\n", rt->rt_nodes->rn_flags); panic("rtfree 2"); + } + /* * the rtentry must have been removed from the routing table * so it is represented in rttrash.. remove that now. @@ -756,14 +759,6 @@ rtexpunge(struct rtentry *rt) if (rnh == NULL) return (EAFNOSUPPORT); RADIX_NODE_HEAD_LOCK_ASSERT(rnh); -#if 0 - /* - * We cannot assume anything about the reference count - * because protocols call us in many situations; often - * before unwinding references to the table entry. - */ - KASSERT(rt->rt_refcnt <= 1, ("bogus refcnt %ld", rt->rt_refcnt)); -#endif /* * Remove the item from the tree; it should be there, * but when callers invoke us blindly it may not (sigh).