write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/net/ipv6/ila/ila_xlat.c
..
..
@@ -383,12 +383,9 @@
383
383
 	struct rhashtable_iter iter;
384
384
 	struct ila_map *ila;
385
385
 	spinlock_t *lock;
386
-	int ret;
386
+	int ret = 0;
387
387
 
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);
392
389
 	rhashtable_walk_start(&iter);
393
390
 
394
391
 	for (;;) {
..
..
@@ -480,6 +477,7 @@
480
477
 
481
478
 	rcu_read_lock();
482
479
 
480
+	ret = -ESRCH;
483
481
 	ila = ila_lookup_by_params(&xp, ilan);
484
482
 	if (ila) {
485
483
 		ret = ila_dump_info(ila,
..
..
@@ -510,23 +508,17 @@
510
508
 	struct net *net = sock_net(cb->skb->sk);
511
509
 	struct ila_net *ilan = net_generic(net, ila_net_id);
512
510
 	struct ila_dump_iter *iter;
513
-	int ret;
514
511
 
515
512
 	iter = kmalloc(sizeof(*iter), GFP_KERNEL);
516
513
 	if (!iter)
517
514
 		return -ENOMEM;
518
515
 
519
-	ret = rhashtable_walk_init(&ilan->xlat.rhash_table, &iter->rhiter,
520
-				   GFP_KERNEL);
521
-	if (ret) {
522
-		kfree(iter);
523
-		return ret;
524
-	}
516
+	rhashtable_walk_enter(&ilan->xlat.rhash_table, &iter->rhiter);
525
517
 
526
518
 	iter->skip = 0;
527
519
 	cb->args[0] = (long)iter;
528
520
 
529
-	return ret;
521
+	return 0;
530
522
 }
531
523
 
532
524
 int ila_xlat_nl_dump_done(struct netlink_callback *cb)
..
..
@@ -609,8 +601,6 @@
609
601
 	rhashtable_walk_stop(rhiter);
610
602
 	return ret;
611
603
 }
612
-
613
-#define ILA_HASH_TABLE_SIZE 1024
614
604
 
615
605
 int ila_xlat_init_net(struct net *net)
616
606
 {