Now there is spin_trylock_bh, use it rather than open coding. Signed-off-by: Stephen Hemminger --- a/net/ipv6/ip6_fib.c 2008-07-21 12:11:46.000000000 -0700 +++ b/net/ipv6/ip6_fib.c 2008-07-21 12:17:52.000000000 -0700 @@ -1447,10 +1447,8 @@ void fib6_run_gc(unsigned long expires, gc_args.timeout = expires ? (int)expires : net->ipv6.sysctl.ip6_rt_gc_interval; } else { - local_bh_disable(); - if (!spin_trylock(&fib6_gc_lock)) { + if (!spin_trylock_bh(&fib6_gc_lock)) { mod_timer(&net->ipv6.ip6_fib_timer, jiffies + HZ); - local_bh_enable(); return; } gc_args.timeout = net->ipv6.sysctl.ip6_rt_gc_interval; -- -- 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