[PATCH] net: ipv4: fib_trie: Don't unnecessarily search for already found fib leaf

[PATCH] net: ipv4: fib_trie: Don't unnecessarily search for already found fib leaf

[igorm]

From: Igor Maravic <igorm@etf.rs>

We've already found leaf, don't search for it again. Same is for fib leaf info.

Signed-off-by: Igor Maravic <igorm@etf.rs>
---
 net/ipv4/fib_trie.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 30b88d7..8063a8c 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1657,7 +1657,12 @@ int fib_table_delete(struct fib_table *tb, struct fib_config *cfg)
 	if (!l)
 		return -ESRCH;
 
-	fa_head = get_fa_head(l, plen);
+	li = find_leaf_info(l, plen);
+
+	if (!li)
+		return -ESRCH;
+
+	fa_head = &li->falh;
 	fa = fib_find_alias(fa_head, tos, 0);
 
 	if (!fa)
@@ -1693,9 +1698,6 @@ int fib_table_delete(struct fib_table *tb, struct fib_config *cfg)
 	rtmsg_fib(RTM_DELROUTE, htonl(key), fa, plen, tb->tb_id,
 		  &cfg->fc_nlinfo, 0);
 
-	l = fib_find_node(t, key);
-	li = find_leaf_info(l, plen);
-
 	list_del_rcu(&fa->fa_list);
 
 	if (!plen)
-- 
1.7.9.5

Re: [PATCH] net: ipv4: fib_trie: Don't unnecessarily search for already found fib leaf

[David Miller]

From: igorm@etf.rs
Date: Mon, 13 Aug 2012 10:26:08 +0200

> From: Igor Maravic <igorm@etf.rs>
> 
> We've already found leaf, don't search for it again. Same is for fib leaf info.
> 
> Signed-off-by: Igor Maravic <igorm@etf.rs>

Applied to net-next, thanks.