diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/rhashtable.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h index 1695378b3c5b..99425f2be708 100644 --- a/include/linux/rhashtable.h +++ b/include/linux/rhashtable.h | |||
@@ -51,7 +51,6 @@ struct rhash_head { | |||
51 | * @size: Number of hash buckets | 51 | * @size: Number of hash buckets |
52 | * @rehash: Current bucket being rehashed | 52 | * @rehash: Current bucket being rehashed |
53 | * @hash_rnd: Random seed to fold into hash | 53 | * @hash_rnd: Random seed to fold into hash |
54 | * @shift: Current size (1 << shift) | ||
55 | * @locks_mask: Mask to apply before accessing locks[] | 54 | * @locks_mask: Mask to apply before accessing locks[] |
56 | * @locks: Array of spinlocks protecting individual buckets | 55 | * @locks: Array of spinlocks protecting individual buckets |
57 | * @walkers: List of active walkers | 56 | * @walkers: List of active walkers |
@@ -63,7 +62,6 @@ struct bucket_table { | |||
63 | unsigned int size; | 62 | unsigned int size; |
64 | unsigned int rehash; | 63 | unsigned int rehash; |
65 | u32 hash_rnd; | 64 | u32 hash_rnd; |
66 | u32 shift; | ||
67 | unsigned int locks_mask; | 65 | unsigned int locks_mask; |
68 | spinlock_t *locks; | 66 | spinlock_t *locks; |
69 | struct list_head walkers; | 67 | struct list_head walkers; |
@@ -85,8 +83,8 @@ struct rhashtable; | |||
85 | * @key_len: Length of key | 83 | * @key_len: Length of key |
86 | * @key_offset: Offset of key in struct to be hashed | 84 | * @key_offset: Offset of key in struct to be hashed |
87 | * @head_offset: Offset of rhash_head in struct to be hashed | 85 | * @head_offset: Offset of rhash_head in struct to be hashed |
88 | * @max_shift: Maximum number of shifts while expanding | 86 | * @max_size: Maximum size while expanding |
89 | * @min_shift: Minimum number of shifts while shrinking | 87 | * @min_size: Minimum size while shrinking |
90 | * @nulls_base: Base value to generate nulls marker | 88 | * @nulls_base: Base value to generate nulls marker |
91 | * @locks_mul: Number of bucket locks to allocate per cpu (default: 128) | 89 | * @locks_mul: Number of bucket locks to allocate per cpu (default: 128) |
92 | * @hashfn: Function to hash key | 90 | * @hashfn: Function to hash key |
@@ -97,8 +95,8 @@ struct rhashtable_params { | |||
97 | size_t key_len; | 95 | size_t key_len; |
98 | size_t key_offset; | 96 | size_t key_offset; |
99 | size_t head_offset; | 97 | size_t head_offset; |
100 | size_t max_shift; | 98 | unsigned int max_size; |
101 | size_t min_shift; | 99 | unsigned int min_size; |
102 | u32 nulls_base; | 100 | u32 nulls_base; |
103 | size_t locks_mul; | 101 | size_t locks_mul; |
104 | rht_hashfn_t hashfn; | 102 | rht_hashfn_t hashfn; |