|
@@ -1776,16 +1776,14 @@ static int fib6_age(struct rt6_info *rt, void *arg)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static DEFINE_SPINLOCK(fib6_gc_lock);
|
|
|
-
|
|
|
void fib6_run_gc(unsigned long expires, struct net *net, bool force)
|
|
|
{
|
|
|
struct fib6_gc_args gc_args;
|
|
|
unsigned long now;
|
|
|
|
|
|
if (force) {
|
|
|
- spin_lock_bh(&fib6_gc_lock);
|
|
|
- } else if (!spin_trylock_bh(&fib6_gc_lock)) {
|
|
|
+ spin_lock_bh(&net->ipv6.fib6_gc_lock);
|
|
|
+ } else if (!spin_trylock_bh(&net->ipv6.fib6_gc_lock)) {
|
|
|
mod_timer(&net->ipv6.ip6_fib_timer, jiffies + HZ);
|
|
|
return;
|
|
|
}
|
|
@@ -1804,7 +1802,7 @@ void fib6_run_gc(unsigned long expires, struct net *net, bool force)
|
|
|
+ net->ipv6.sysctl.ip6_rt_gc_interval));
|
|
|
else
|
|
|
del_timer(&net->ipv6.ip6_fib_timer);
|
|
|
- spin_unlock_bh(&fib6_gc_lock);
|
|
|
+ spin_unlock_bh(&net->ipv6.fib6_gc_lock);
|
|
|
}
|
|
|
|
|
|
static void fib6_gc_timer_cb(unsigned long arg)
|
|
@@ -1816,6 +1814,7 @@ static int __net_init fib6_net_init(struct net *net)
|
|
|
{
|
|
|
size_t size = sizeof(struct hlist_head) * FIB6_TABLE_HASHSZ;
|
|
|
|
|
|
+ spin_lock_init(&net->ipv6.fib6_gc_lock);
|
|
|
rwlock_init(&net->ipv6.fib6_walker_lock);
|
|
|
INIT_LIST_HEAD(&net->ipv6.fib6_walkers);
|
|
|
setup_timer(&net->ipv6.ip6_fib_timer, fib6_gc_timer_cb, (unsigned long)net);
|