Message ID | 1347427553-17781-1-git-send-email-roy.qing.li@gmail.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
On Wed, 2012-09-12 at 13:25 +0800, roy.qing.li@gmail.com wrote: > From: Li RongQing <roy.qing.li@gmail.com> > > geting route info does not write rt->rt6i_table, so replace > write lock with read lock > > Signed-off-by: Li RongQing <roy.qing.li@gmail.com> > --- > net/ipv6/route.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/net/ipv6/route.c b/net/ipv6/route.c > index 399613b..8be1d86 100644 > --- a/net/ipv6/route.c > +++ b/net/ipv6/route.c > @@ -1837,7 +1837,7 @@ static struct rt6_info *rt6_get_route_info(struct net *net, > if (!table) > return NULL; > > - write_lock_bh(&table->tb6_lock); > + read_lock_bh(&table->tb6_lock); > fn = fib6_locate(&table->tb6_root, prefix ,prefixlen, NULL, 0); > if (!fn) > goto out; > @@ -1853,7 +1853,7 @@ static struct rt6_info *rt6_get_route_info(struct net *net, > break; > } > out: > - write_unlock_bh(&table->tb6_lock); > + read_unlock_bh(&table->tb6_lock); > return rt; > } > > @@ -1896,7 +1896,7 @@ struct rt6_info *rt6_get_dflt_router(const struct in6_addr *addr, struct net_dev > if (!table) > return NULL; > > - write_lock_bh(&table->tb6_lock); > + read_lock_bh(&table->tb6_lock); > for (rt = table->tb6_root.leaf; rt; rt=rt->dst.rt6_next) { > if (dev == rt->dst.dev && > ((rt->rt6i_flags & (RTF_ADDRCONF | RTF_DEFAULT)) == (RTF_ADDRCONF | RTF_DEFAULT)) && > @@ -1905,7 +1905,7 @@ struct rt6_info *rt6_get_dflt_router(const struct in6_addr *addr, struct net_dev > } > if (rt) > dst_hold(&rt->dst); > - write_unlock_bh(&table->tb6_lock); > + read_unlock_bh(&table->tb6_lock); > return rt; > } > Why dont you also change addrconf_get_prefix_route() ? -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
>> > > Why dont you also change addrconf_get_prefix_route() ? > > I did not find it, I will send v2 Thanks -Roy -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 399613b..8be1d86 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1837,7 +1837,7 @@ static struct rt6_info *rt6_get_route_info(struct net *net, if (!table) return NULL; - write_lock_bh(&table->tb6_lock); + read_lock_bh(&table->tb6_lock); fn = fib6_locate(&table->tb6_root, prefix ,prefixlen, NULL, 0); if (!fn) goto out; @@ -1853,7 +1853,7 @@ static struct rt6_info *rt6_get_route_info(struct net *net, break; } out: - write_unlock_bh(&table->tb6_lock); + read_unlock_bh(&table->tb6_lock); return rt; } @@ -1896,7 +1896,7 @@ struct rt6_info *rt6_get_dflt_router(const struct in6_addr *addr, struct net_dev if (!table) return NULL; - write_lock_bh(&table->tb6_lock); + read_lock_bh(&table->tb6_lock); for (rt = table->tb6_root.leaf; rt; rt=rt->dst.rt6_next) { if (dev == rt->dst.dev && ((rt->rt6i_flags & (RTF_ADDRCONF | RTF_DEFAULT)) == (RTF_ADDRCONF | RTF_DEFAULT)) && @@ -1905,7 +1905,7 @@ struct rt6_info *rt6_get_dflt_router(const struct in6_addr *addr, struct net_dev } if (rt) dst_hold(&rt->dst); - write_unlock_bh(&table->tb6_lock); + read_unlock_bh(&table->tb6_lock); return rt; }