hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/net/ipv6/ila/ila_xlat.c
....@@ -383,12 +383,9 @@
383383 struct rhashtable_iter iter;
384384 struct ila_map *ila;
385385 spinlock_t *lock;
386
- int ret;
386
+ int ret = 0;
387387
388
- ret = rhashtable_walk_init(&ilan->xlat.rhash_table, &iter, GFP_KERNEL);
389
- if (ret)
390
- goto done;
391
-
388
+ rhashtable_walk_enter(&ilan->xlat.rhash_table, &iter);
392389 rhashtable_walk_start(&iter);
393390
394391 for (;;) {
....@@ -510,23 +507,17 @@
510507 struct net *net = sock_net(cb->skb->sk);
511508 struct ila_net *ilan = net_generic(net, ila_net_id);
512509 struct ila_dump_iter *iter;
513
- int ret;
514510
515511 iter = kmalloc(sizeof(*iter), GFP_KERNEL);
516512 if (!iter)
517513 return -ENOMEM;
518514
519
- ret = rhashtable_walk_init(&ilan->xlat.rhash_table, &iter->rhiter,
520
- GFP_KERNEL);
521
- if (ret) {
522
- kfree(iter);
523
- return ret;
524
- }
515
+ rhashtable_walk_enter(&ilan->xlat.rhash_table, &iter->rhiter);
525516
526517 iter->skip = 0;
527518 cb->args[0] = (long)iter;
528519
529
- return ret;
520
+ return 0;
530521 }
531522
532523 int ila_xlat_nl_dump_done(struct netlink_callback *cb)
....@@ -609,8 +600,6 @@
609600 rhashtable_walk_stop(rhiter);
610601 return ret;
611602 }
612
-
613
-#define ILA_HASH_TABLE_SIZE 1024
614603
615604 int ila_xlat_init_net(struct net *net)
616605 {