diff options
Diffstat (limited to 'lib/rhashtable.c')
-rw-r--r-- | lib/rhashtable.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lib/rhashtable.c b/lib/rhashtable.c index 6529fe1b45c1..7708699a5b96 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | union nested_table { | 35 | union nested_table { |
36 | union nested_table __rcu *table; | 36 | union nested_table __rcu *table; |
37 | struct rhash_lock_head __rcu *bucket; | 37 | struct rhash_lock_head *bucket; |
38 | }; | 38 | }; |
39 | 39 | ||
40 | static u32 head_hashfn(struct rhashtable *ht, | 40 | static u32 head_hashfn(struct rhashtable *ht, |
@@ -216,7 +216,7 @@ static struct bucket_table *rhashtable_last_table(struct rhashtable *ht, | |||
216 | } | 216 | } |
217 | 217 | ||
218 | static int rhashtable_rehash_one(struct rhashtable *ht, | 218 | static int rhashtable_rehash_one(struct rhashtable *ht, |
219 | struct rhash_lock_head __rcu **bkt, | 219 | struct rhash_lock_head **bkt, |
220 | unsigned int old_hash) | 220 | unsigned int old_hash) |
221 | { | 221 | { |
222 | struct bucket_table *old_tbl = rht_dereference(ht->tbl, ht); | 222 | struct bucket_table *old_tbl = rht_dereference(ht->tbl, ht); |
@@ -269,7 +269,7 @@ static int rhashtable_rehash_chain(struct rhashtable *ht, | |||
269 | unsigned int old_hash) | 269 | unsigned int old_hash) |
270 | { | 270 | { |
271 | struct bucket_table *old_tbl = rht_dereference(ht->tbl, ht); | 271 | struct bucket_table *old_tbl = rht_dereference(ht->tbl, ht); |
272 | struct rhash_lock_head __rcu **bkt = rht_bucket_var(old_tbl, old_hash); | 272 | struct rhash_lock_head **bkt = rht_bucket_var(old_tbl, old_hash); |
273 | int err; | 273 | int err; |
274 | 274 | ||
275 | if (!bkt) | 275 | if (!bkt) |
@@ -478,7 +478,7 @@ fail: | |||
478 | } | 478 | } |
479 | 479 | ||
480 | static void *rhashtable_lookup_one(struct rhashtable *ht, | 480 | static void *rhashtable_lookup_one(struct rhashtable *ht, |
481 | struct rhash_lock_head __rcu **bkt, | 481 | struct rhash_lock_head **bkt, |
482 | struct bucket_table *tbl, unsigned int hash, | 482 | struct bucket_table *tbl, unsigned int hash, |
483 | const void *key, struct rhash_head *obj) | 483 | const void *key, struct rhash_head *obj) |
484 | { | 484 | { |
@@ -529,7 +529,7 @@ static void *rhashtable_lookup_one(struct rhashtable *ht, | |||
529 | } | 529 | } |
530 | 530 | ||
531 | static struct bucket_table *rhashtable_insert_one(struct rhashtable *ht, | 531 | static struct bucket_table *rhashtable_insert_one(struct rhashtable *ht, |
532 | struct rhash_lock_head __rcu **bkt, | 532 | struct rhash_lock_head **bkt, |
533 | struct bucket_table *tbl, | 533 | struct bucket_table *tbl, |
534 | unsigned int hash, | 534 | unsigned int hash, |
535 | struct rhash_head *obj, | 535 | struct rhash_head *obj, |
@@ -584,7 +584,7 @@ static void *rhashtable_try_insert(struct rhashtable *ht, const void *key, | |||
584 | { | 584 | { |
585 | struct bucket_table *new_tbl; | 585 | struct bucket_table *new_tbl; |
586 | struct bucket_table *tbl; | 586 | struct bucket_table *tbl; |
587 | struct rhash_lock_head __rcu **bkt; | 587 | struct rhash_lock_head **bkt; |
588 | unsigned int hash; | 588 | unsigned int hash; |
589 | void *data; | 589 | void *data; |
590 | 590 | ||
@@ -1166,8 +1166,8 @@ void rhashtable_destroy(struct rhashtable *ht) | |||
1166 | } | 1166 | } |
1167 | EXPORT_SYMBOL_GPL(rhashtable_destroy); | 1167 | EXPORT_SYMBOL_GPL(rhashtable_destroy); |
1168 | 1168 | ||
1169 | struct rhash_lock_head __rcu **__rht_bucket_nested(const struct bucket_table *tbl, | 1169 | struct rhash_lock_head **__rht_bucket_nested(const struct bucket_table *tbl, |
1170 | unsigned int hash) | 1170 | unsigned int hash) |
1171 | { | 1171 | { |
1172 | const unsigned int shift = PAGE_SHIFT - ilog2(sizeof(void *)); | 1172 | const unsigned int shift = PAGE_SHIFT - ilog2(sizeof(void *)); |
1173 | unsigned int index = hash & ((1 << tbl->nest) - 1); | 1173 | unsigned int index = hash & ((1 << tbl->nest) - 1); |
@@ -1195,10 +1195,10 @@ struct rhash_lock_head __rcu **__rht_bucket_nested(const struct bucket_table *tb | |||
1195 | } | 1195 | } |
1196 | EXPORT_SYMBOL_GPL(__rht_bucket_nested); | 1196 | EXPORT_SYMBOL_GPL(__rht_bucket_nested); |
1197 | 1197 | ||
1198 | struct rhash_lock_head __rcu **rht_bucket_nested(const struct bucket_table *tbl, | 1198 | struct rhash_lock_head **rht_bucket_nested(const struct bucket_table *tbl, |
1199 | unsigned int hash) | 1199 | unsigned int hash) |
1200 | { | 1200 | { |
1201 | static struct rhash_lock_head __rcu *rhnull; | 1201 | static struct rhash_lock_head *rhnull; |
1202 | 1202 | ||
1203 | if (!rhnull) | 1203 | if (!rhnull) |
1204 | INIT_RHT_NULLS_HEAD(rhnull); | 1204 | INIT_RHT_NULLS_HEAD(rhnull); |
@@ -1206,9 +1206,9 @@ struct rhash_lock_head __rcu **rht_bucket_nested(const struct bucket_table *tbl, | |||
1206 | } | 1206 | } |
1207 | EXPORT_SYMBOL_GPL(rht_bucket_nested); | 1207 | EXPORT_SYMBOL_GPL(rht_bucket_nested); |
1208 | 1208 | ||
1209 | struct rhash_lock_head __rcu **rht_bucket_nested_insert(struct rhashtable *ht, | 1209 | struct rhash_lock_head **rht_bucket_nested_insert(struct rhashtable *ht, |
1210 | struct bucket_table *tbl, | 1210 | struct bucket_table *tbl, |
1211 | unsigned int hash) | 1211 | unsigned int hash) |
1212 | { | 1212 | { |
1213 | const unsigned int shift = PAGE_SHIFT - ilog2(sizeof(void *)); | 1213 | const unsigned int shift = PAGE_SHIFT - ilog2(sizeof(void *)); |
1214 | unsigned int index = hash & ((1 << tbl->nest) - 1); | 1214 | unsigned int index = hash & ((1 << tbl->nest) - 1); |