[PATCH 1/2] ipv4: Cleanup struct net dereference in rt_intern_hash

[PATCH 1/2] ipv4: Cleanup struct net dereference in rt_intern_hash

[Pavel Emelyanov]

There's no need in getting it 3 times and gcc isn't smart enough
to understand this himself.

This is just a cleanup before the fix (next patch).

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
 net/ipv4/route.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 32d3961..28c1c2f 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1212,11 +1212,11 @@ restart:
 		    slow_chain_length(rt_hash_table[hash].chain) > rt_chain_length_max) {
 			struct net *net = dev_net(rt->u.dst.dev);
 			int num = ++net->ipv4.current_rt_cache_rebuild_count;
-			if (!rt_caching(dev_net(rt->u.dst.dev))) {
+			if (!rt_caching(net)) {
 				printk(KERN_WARNING "%s: %d rebuilds is over limit, route caching disabled\n",
 					rt->u.dst.dev->name, num);
 			}
-			rt_emergency_hash_rebuild(dev_net(rt->u.dst.dev));
+			rt_emergency_hash_rebuild(net);
 		}
 	}
 

Re: [PATCH 1/2] ipv4: Cleanup struct net dereference in rt_intern_hash

[David Miller]

From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 24 Mar 2010 20:43:17 +0300

> There's no need in getting it 3 times and gcc isn't smart enough
> to understand this himself.
> 
> This is just a cleanup before the fix (next patch).
> 
> Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

Applied.