diff options
| author | Alexander Duyck <alexander.h.duyck@redhat.com> | 2015-01-22 15:51:33 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-25 14:47:16 -0800 |
| commit | 30cfe7c9c88d73440560d7e381bab12f5463a6cd (patch) | |
| tree | aeacfcc4082476e4e5f482030091926cef5035fb | |
| parent | 95f60ea3e99aef5967d1566979f4ade7be386e34 (diff) | |
| download | blackbird-op-linux-30cfe7c9c88d73440560d7e381bab12f5463a6cd.tar.gz blackbird-op-linux-30cfe7c9c88d73440560d7e381bab12f5463a6cd.zip | |
fib_trie: Use empty_children instead of counting empty nodes in stats collection
It doesn't make much sense to count the pointers ourselves when
empty_children already has a count for the number of NULL pointers stored
in the tnode. As such save ourselves the cycles and just use
empty_children.
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/fib_trie.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index f874e1811eab..90654bb64e21 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -1954,16 +1954,10 @@ static void trie_collect_stats(struct trie *t, struct trie_stat *s) hlist_for_each_entry_rcu(li, &n->list, hlist) ++s->prefixes; } else { - unsigned long i; - s->tnodes++; if (n->bits < MAX_STAT_DEPTH) s->nodesizes[n->bits]++; - - for (i = tnode_child_length(n); i--;) { - if (!rcu_access_pointer(n->child[i])) - s->nullpointers++; - } + s->nullpointers += n->empty_children; } } rcu_read_unlock(); |
