mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 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 (;;) {
..
..
@@ -510,23 +507,17 @@
510
507
 	struct net *net = sock_net(cb->skb->sk);
511
508
 	struct ila_net *ilan = net_generic(net, ila_net_id);
512
509
 	struct ila_dump_iter *iter;
513
-	int ret;
514
510
 
515
511
 	iter = kmalloc(sizeof(*iter), GFP_KERNEL);
516
512
 	if (!iter)
517
513
 		return -ENOMEM;
518
514
 
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);
525
516
 
526
517
 	iter->skip = 0;
527
518
 	cb->args[0] = (long)iter;
528
519
 
529
-	return ret;
520
+	return 0;
530
521
 }
531
522
 
532
523
 int ila_xlat_nl_dump_done(struct netlink_callback *cb)
..
..
@@ -609,8 +600,6 @@
609
600
 	rhashtable_walk_stop(rhiter);
610
601
 	return ret;
611
602
 }
612
-
613
-#define ILA_HASH_TABLE_SIZE 1024
614
603
 
615
604
 int ila_xlat_init_net(struct net *net)
616
605
 {