Date: Tue, 16 Dec 2008 11:01:36 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r186176 - head/sys/net Message-ID: <200812161101.mBGB1aik035887@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Tue Dec 16 11:01:36 2008 New Revision: 186176 URL: http://svn.freebsd.org/changeset/base/186176 Log: remove assertion checks for now - ipfw uses its own lock for protecting its radix tree instance Modified: head/sys/net/radix.c Modified: head/sys/net/radix.c ============================================================================== --- head/sys/net/radix.c Tue Dec 16 09:51:13 2008 (r186175) +++ head/sys/net/radix.c Tue Dec 16 11:01:36 2008 (r186176) @@ -274,7 +274,6 @@ rn_match(v_arg, head) int off = t->rn_offset, vlen = LEN(cp), matched_off; register int test, b, rn_bit; - RADIX_NODE_HEAD_LOCK_ASSERT(head); /* * Open code rn_search(v, top) to avoid overhead of extra * subroutine call. @@ -619,8 +618,6 @@ rn_addroute(v_arg, n_arg, head, treenode caddr_t mmask; struct radix_mask *m, **mp; - - RADIX_NODE_HEAD_WLOCK_ASSERT(head); /* * In dealing with non-contiguous masks, there may be * many different routes which have the same mask. @@ -791,7 +788,6 @@ rn_delete(v_arg, netmask_arg, head) caddr_t v, netmask; int b, head_off, vlen; - RADIX_NODE_HEAD_WLOCK_ASSERT(head); v = v_arg; netmask = netmask_arg; x = head->rnh_treetop; @@ -985,7 +981,6 @@ rn_walktree_from(h, a, m, f, w) int stopping = 0; int lastb; - RADIX_NODE_HEAD_LOCK_ASSERT(h); /* * rn_search_m is sort-of-open-coded here. We cannot use the * function because we need to keep track of the last node seen. @@ -1093,7 +1088,6 @@ rn_walktree(h, f, w) * the successor node in advance. */ - RADIX_NODE_HEAD_LOCK_ASSERT(h); /* First time through node, go left */ while (rn->rn_bit >= 0) rn = rn->rn_left;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812161101.mBGB1aik035887>