diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-27 16:06:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-27 16:06:21 -0500 |
| commit | c0eebfa3233ef59109aa314ef19451d2156a2635 (patch) | |
| tree | 3e4d9c6941729846c3c55c7f256197321311b3aa /net/tipc | |
| parent | 0d79a493e507437a2135e5ac1a447d4d503488d8 (diff) | |
| parent | 4c4b52d9b2df45e8216d3e30b5452e4a364d2cac (diff) | |
Merge branch 'rhashtable'
Daniel Borkmann says:
====================
rhashtable updates
As discussed, I'm sending out rhashtable fixups for -net.
I have a couple of more patches I was working on last week pending,
i.e. to get rid of ht->nelems and ht->shift atomic operations which
speed-up pure insertions/deletions, e.g. on my laptop I have 2 threads,
inserting 7M entries each, that will reduce insertion time from ~1,450 ms
to 865 ms (performance should even be better after removing the
grow/shrink indirections). I guess that however is rather something
for net-next.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/socket.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index f73e975af80b..b4d4467d0bb0 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -2364,8 +2364,6 @@ int tipc_sk_rht_init(struct net *net) .hashfn = jhash, .max_shift = 20, /* 1M */ .min_shift = 8, /* 256 */ - .grow_decision = rht_grow_above_75, - .shrink_decision = rht_shrink_below_30, }; return rhashtable_init(&tn->sk_rht, &rht_params); |