Author: gnn
Date: Tue Mar 4 23:55:04 2014
New Revision: 262758
URL: http://svnweb.freebsd.org/changeset/base/262758
Log:
Revert previous commit (262727) and bounce patch back to the
submitter.
Pointed out by: jhb
Modified:
head/sys/net/radix.h
head/sys/net/route.c
Modified: head/sys/net/radix.h
==============================================================================
--- head/sys/net/radix.h Tue Mar 4 23:27:27 2014 (r262757)
+++ head/sys/net/radix.h Tue Mar 4 23:55:04 2014 (r262758)
@@ -149,8 +149,7 @@ struct radix_node_head {
#define RADIX_NODE_HEAD_DESTROY(rnh) rw_destroy(&(rnh)->rnh_lock)
-#define RADIX_NODE_HEAD_LOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock,
RA_WLOCKED)
-#define RADIX_NODE_HEAD_RLOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock,
RA_RLOCKED)
+#define RADIX_NODE_HEAD_LOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock,
RA_LOCKED)
#define RADIX_NODE_HEAD_WLOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock,
RA_WLOCKED)
#endif /* _KERNEL */
Modified: head/sys/net/route.c
==============================================================================
--- head/sys/net/route.c Tue Mar 4 23:27:27 2014 (r262757)
+++ head/sys/net/route.c Tue Mar 4 23:55:04 2014 (r262758)
@@ -381,7 +381,7 @@ rtalloc1_fib(struct sockaddr *dst, int r
RADIX_NODE_HEAD_RLOCK(rnh);
#ifdef INVARIANTS
else
- RADIX_NODE_HEAD_RLOCK_ASSERT(rnh);
+ RADIX_NODE_HEAD_LOCK_ASSERT(rnh);
#endif
rn = rnh->rnh_matchaddr(dst, rnh);
if (rn && ((rn->rn_flags & RNF_ROOT) == 0)) {
@@ -1000,10 +1000,9 @@ rn_mpath_update(int req, struct rt_addri
* a matching RTAX_GATEWAY.
*/
struct rtentry *rt, *rto = NULL;
- struct radix_node *rn;
+ register struct radix_node *rn;
int error = 0;
- RADIX_NODE_HEAD_LOCK_ASSERT(rnh);
rn = rnh->rnh_lookup(dst, netmask, rnh);
if (rn == NULL)
return (ESRCH);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
