redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

rhashtable: Remove obsolete rhashtable_walk_init function 

The rhashtable_walk_init function has been obsolete for more than
two years.  This patch finally converts its last users over to
rhashtable_walk_enter and removes it.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
hifive-unleashed-5.1
Herbert Xu 2019-02-14 22:03:27 +08:00 committed by Johannes Berg
parent 3692293163
commit 6c4128f658
5 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/rhashtable.h
View File

@ -1113,14 +1113,6 @@ static inline int rhashtable_replace_fast(
return err; return err;
} }
/* Obsolete function, do not use in new code. */
static inline int rhashtable_walk_init(struct rhashtable *ht,
struct rhashtable_iter *iter, gfp_t gfp)
{
rhashtable_walk_enter(ht, iter);
return 0;
}
/** /**
* rhltable_walk_enter - Initialise an iterator * rhltable_walk_enter - Initialise an iterator
* @hlt: Table to walk over * @hlt: Table to walk over

2
lib/rhashtable.c
View File

@ -682,7 +682,7 @@ EXPORT_SYMBOL_GPL(rhashtable_walk_enter);
* rhashtable_walk_exit - Free an iterator * rhashtable_walk_exit - Free an iterator
* @iter: Hash table Iterator * @iter: Hash table Iterator
* *
* This function frees resources allocated by rhashtable_walk_init. * This function frees resources allocated by rhashtable_walk_enter.
*/ */
void rhashtable_walk_exit(struct rhashtable_iter *iter) void rhashtable_walk_exit(struct rhashtable_iter *iter)
{ {

9
lib/test_rhashtable.c
View File

@ -177,16 +177,11 @@ static int __init test_rht_lookup(struct rhashtable *ht, struct test_obj *array,
static void test_bucket_stats(struct rhashtable *ht, unsigned int entries) static void test_bucket_stats(struct rhashtable *ht, unsigned int entries)
{ {
unsigned int err, total = 0, chain_len = 0; unsigned int total = 0, chain_len = 0;
struct rhashtable_iter hti; struct rhashtable_iter hti;
struct rhash_head *pos; struct rhash_head *pos;
err = rhashtable_walk_init(ht, &hti, GFP_KERNEL); rhashtable_walk_enter(ht, &hti);
if (err) {
pr_warn("Test failed: allocation error");
return;
}
rhashtable_walk_start(&hti); rhashtable_walk_start(&hti);
while ((pos = rhashtable_walk_next(&hti))) { while ((pos = rhashtable_walk_next(&hti))) {

15
net/ipv6/ila/ila_xlat.c
View File

@ -385,10 +385,7 @@ int ila_xlat_nl_cmd_flush(struct sk_buff *skb, struct genl_info *info)
spinlock_t *lock; spinlock_t *lock;
int ret; int ret;
ret = rhashtable_walk_init(&ilan->xlat.rhash_table, &iter, GFP_KERNEL); rhashtable_walk_enter(&ilan->xlat.rhash_table, &iter);
if (ret)
goto done;
rhashtable_walk_start(&iter); rhashtable_walk_start(&iter);
for (;;) { for (;;) {
@ -509,23 +506,17 @@ int ila_xlat_nl_dump_start(struct netlink_callback *cb)
struct net *net = sock_net(cb->skb->sk); struct net *net = sock_net(cb->skb->sk);
struct ila_net *ilan = net_generic(net, ila_net_id); struct ila_net *ilan = net_generic(net, ila_net_id);
struct ila_dump_iter *iter; struct ila_dump_iter *iter;
int ret;
iter = kmalloc(sizeof(*iter), GFP_KERNEL); iter = kmalloc(sizeof(*iter), GFP_KERNEL);
if (!iter) if (!iter)
return -ENOMEM; return -ENOMEM;
ret = rhashtable_walk_init(&ilan->xlat.rhash_table, &iter->rhiter, rhashtable_walk_enter(&ilan->xlat.rhash_table, &iter->rhiter);
GFP_KERNEL);
if (ret) {
kfree(iter);
return ret;
}
iter->skip = 0; iter->skip = 0;
cb->args[0] = (long)iter; cb->args[0] = (long)iter;
return ret; return 0;
} }
int ila_xlat_nl_dump_done(struct netlink_callback *cb) int ila_xlat_nl_dump_done(struct netlink_callback *cb)

10
net/netlink/af_netlink.c
View File

@ -2549,15 +2549,7 @@ struct nl_seq_iter {
static int netlink_walk_start(struct nl_seq_iter *iter) static int netlink_walk_start(struct nl_seq_iter *iter)
{ {
int err; rhashtable_walk_enter(&nl_table[iter->link].hash, &iter->hti);
err = rhashtable_walk_init(&nl_table[iter->link].hash, &iter->hti,
GFP_KERNEL);
if (err) {
iter->link = MAX_LINKS;
return err;
}
rhashtable_walk_start(&iter->hti); rhashtable_walk_start(&iter->hti);
return 0; return 0;