diff options
| author | David S. Miller <davem@davemloft.net> | 2019-04-07 19:12:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-07 19:12:12 -0700 |
| commit | 9186c90bbb9525f46eddb590be26c749b5b1def7 (patch) | |
| tree | b2fc4e6c9902041bcdb4c8bfc44d2d5d3040088c /net/ipv6 | |
| parent | 1e045a62eea6a60f0463b01f72256a5ba483da1c (diff) | |
| parent | 149212f07856b25a9d342bfd6d736519b2ef66dc (diff) | |
| download | net-9186c90bbb9525f46eddb590be26c749b5b1def7.tar.gz | |
Merge branch 'rhashtable-bitlocks'
NeilBrown says:
====================
Convert rhashtable to use bitlocks
This series converts rhashtable to use a per-bucket bitlock
rather than a separate array of spinlocks.
This:
reduces memory usage
results in slightly fewer memory accesses
slightly improves parallelism
makes a configuration option unnecessary
The main change from previous version is to use a distinct type for
the pointer in the bucket which has a bit-lock in it. This
helped find two places where rht_ptr() was missed, one
in rhashtable_free_and_destroy() in print_ht in the test code.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6mr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index e4dd57976737a8..4e69847ed5bef4 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -355,7 +355,6 @@ static const struct rhashtable_params ip6mr_rht_params = { .key_offset = offsetof(struct mfc6_cache, cmparg), .key_len = sizeof(struct mfc6_cache_cmp_arg), .nelem_hint = 3, - .locks_mul = 1, .obj_cmpfn = ip6mr_hash_cmp, .automatic_shrinking = true, }; |