Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 93adcc80f3288f1827baf6f821af818f6eeef7f9

Authored by Alexey Dobriyan
Committed by David S. Miller
1 parent def8b4faff
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

net: don't use INIT_RCU_HEAD 

call_rcu() will unconditionally rewrite RCU head anyway.
Applies to
	struct neigh_parms
	struct neigh_table
	struct net
	struct cipso_v4_doi
	struct in_ifaddr
	struct in_device
	rt->u.dst

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 5 changed files with 1 additions and 14 deletions Side-by-side Diff

net/core/neighbour.c
Diff comments   View file @ 93adcc8
... ... @@ -1340,7 +1340,6 @@
1340 1340 if (p) {
1341 1341 p->tbl = tbl;
1342 1342 atomic_set(&p->refcnt, 1);
1343   - INIT_RCU_HEAD(&p->rcu_head);
1344 1343 p->reachable_time =
1345 1344 neigh_rand_reach_time(p->base_reachable_time);
1346 1345  
... ... @@ -1412,7 +1411,6 @@
1412 1411 tbl->parms.net = &init_net;
1413 1412 #endif
1414 1413 atomic_set(&tbl->parms.refcnt, 1);
1415   - INIT_RCU_HEAD(&tbl->parms.rcu_head);
1416 1414 tbl->parms.reachable_time =
1417 1415 neigh_rand_reach_time(tbl->parms.base_reachable_time);
1418 1416  
net/core/net_namespace.c
Diff comments   View file @ 93adcc8
... ... @@ -47,7 +47,6 @@
47 47 goto out;
48 48  
49 49 ng->len = INITIAL_NET_GEN_PTRS;
50   - INIT_RCU_HEAD(&ng->rcu);
51 50 rcu_assign_pointer(net->gen, ng);
52 51  
53 52 error = 0;
... ... @@ -446,7 +445,6 @@
446 445 */
447 446  
448 447 ng->len = id;
449   - INIT_RCU_HEAD(&ng->rcu);
450 448 memcpy(&ng->ptr, &old_ng->ptr, old_ng->len);
451 449  
452 450 rcu_assign_pointer(net->gen, ng);
net/ipv4/cipso_ipv4.c
Diff comments   View file @ 93adcc8
... ... @@ -490,7 +490,6 @@
490 490 }
491 491  
492 492 atomic_set(&doi_def->refcount, 1);
493   - INIT_RCU_HEAD(&doi_def->rcu);
494 493  
495 494 spin_lock(&cipso_v4_doi_list_lock);
496 495 if (cipso_v4_doi_search(doi_def->doi) != NULL)
... ... @@ -112,13 +112,7 @@
112 112  
113 113 static struct in_ifaddr *inet_alloc_ifa(void)
114 114 {
115   - struct in_ifaddr *ifa = kzalloc(sizeof(*ifa), GFP_KERNEL);
116   -
117   - if (ifa) {
118   - INIT_RCU_HEAD(&ifa->rcu_head);
119   - }
120   -
121   - return ifa;
  115 + return kzalloc(sizeof(struct in_ifaddr), GFP_KERNEL);
122 116 }
123 117  
124 118 static void inet_rcu_free_ifa(struct rcu_head *head)
... ... @@ -161,7 +155,6 @@
161 155 in_dev = kzalloc(sizeof(*in_dev), GFP_KERNEL);
162 156 if (!in_dev)
163 157 goto out;
164   - INIT_RCU_HEAD(&in_dev->rcu_head);
165 158 memcpy(&in_dev->cnf, dev_net(dev)->ipv4.devconf_dflt,
166 159 sizeof(in_dev->cnf));
167 160 in_dev->cnf.sysctl = NULL;
... ... @@ -1386,7 +1386,6 @@
1386 1386  
1387 1387 /* Copy all the information. */
1388 1388 *rt = *rth;
1389   - INIT_RCU_HEAD(&rt->u.dst.rcu_head);
1390 1389 rt->u.dst.__use = 1;
1391 1390 atomic_set(&rt->u.dst.__refcnt, 1);
1392 1391 rt->u.dst.child = NULL;