android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: don't use INIT_RCU_HEAD

Browse Source 
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>
This commit is contained in:
Alexey Dobriyan 2008-10-28 13:25:09 -07:00 committed by David S. Miller
parent def8b4faff
commit 93adcc80f3
5 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/core/neighbour.c
View File

@ -1340,7 +1340,6 @@ struct neigh_parms *neigh_parms_alloc(struct net_device *dev,
if (p) { if (p) {
p->tbl = tbl; p->tbl = tbl;
atomic_set(&p->refcnt, 1); atomic_set(&p->refcnt, 1);
INIT_RCU_HEAD(&p->rcu_head);
p->reachable_time = p->reachable_time =
neigh_rand_reach_time(p->base_reachable_time); neigh_rand_reach_time(p->base_reachable_time);
@ -1412,7 +1411,6 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl)
tbl->parms.net = &init_net; tbl->parms.net = &init_net;
#endif #endif
atomic_set(&tbl->parms.refcnt, 1); atomic_set(&tbl->parms.refcnt, 1);
INIT_RCU_HEAD(&tbl->parms.rcu_head);
tbl->parms.reachable_time = tbl->parms.reachable_time =
neigh_rand_reach_time(tbl->parms.base_reachable_time); neigh_rand_reach_time(tbl->parms.base_reachable_time);

2
net/core/net_namespace.c
View File

@ -47,7 +47,6 @@ static __net_init int setup_net(struct net *net)
goto out; goto out;
ng->len = INITIAL_NET_GEN_PTRS; ng->len = INITIAL_NET_GEN_PTRS;
INIT_RCU_HEAD(&ng->rcu);
rcu_assign_pointer(net->gen, ng); rcu_assign_pointer(net->gen, ng);
error = 0; error = 0;
@ -446,7 +445,6 @@ int net_assign_generic(struct net *net, int id, void *data)
*/ */
ng->len = id; ng->len = id;
INIT_RCU_HEAD(&ng->rcu);
memcpy(&ng->ptr, &old_ng->ptr, old_ng->len); memcpy(&ng->ptr, &old_ng->ptr, old_ng->len);
rcu_assign_pointer(net->gen, ng); rcu_assign_pointer(net->gen, ng);

1
net/ipv4/cipso_ipv4.c
View File

@ -490,7 +490,6 @@ int cipso_v4_doi_add(struct cipso_v4_doi *doi_def)
} }
atomic_set(&doi_def->refcount, 1); atomic_set(&doi_def->refcount, 1);
INIT_RCU_HEAD(&doi_def->rcu);
spin_lock(&cipso_v4_doi_list_lock); spin_lock(&cipso_v4_doi_list_lock);
if (cipso_v4_doi_search(doi_def->doi) != NULL) if (cipso_v4_doi_search(doi_def->doi) != NULL)

9
net/ipv4/devinet.c
View File

@ -112,13 +112,7 @@ static inline void devinet_sysctl_unregister(struct in_device *idev)
static struct in_ifaddr *inet_alloc_ifa(void) static struct in_ifaddr *inet_alloc_ifa(void)
{ {
struct in_ifaddr *ifa = kzalloc(sizeof(*ifa), GFP_KERNEL); return kzalloc(sizeof(struct in_ifaddr), GFP_KERNEL);
if (ifa) {
INIT_RCU_HEAD(&ifa->rcu_head);
}
return ifa;
} }
static void inet_rcu_free_ifa(struct rcu_head *head) static void inet_rcu_free_ifa(struct rcu_head *head)
@ -161,7 +155,6 @@ static struct in_device *inetdev_init(struct net_device *dev)
in_dev = kzalloc(sizeof(*in_dev), GFP_KERNEL); in_dev = kzalloc(sizeof(*in_dev), GFP_KERNEL);
if (!in_dev) if (!in_dev)
goto out; goto out;
INIT_RCU_HEAD(&in_dev->rcu_head);
memcpy(&in_dev->cnf, dev_net(dev)->ipv4.devconf_dflt, memcpy(&in_dev->cnf, dev_net(dev)->ipv4.devconf_dflt,
sizeof(in_dev->cnf)); sizeof(in_dev->cnf));
in_dev->cnf.sysctl = NULL; in_dev->cnf.sysctl = NULL;

1
net/ipv4/route.c
View File

@ -1386,7 +1386,6 @@ void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw,
/* Copy all the information. */ /* Copy all the information. */
*rt = *rth; *rt = *rth;
INIT_RCU_HEAD(&rt->u.dst.rcu_head);
rt->u.dst.__use = 1; rt->u.dst.__use = 1;
atomic_set(&rt->u.dst.__refcnt, 1); atomic_set(&rt->u.dst.__refcnt, 1);
rt->u.dst.child = NULL; rt->u.dst.child = NULL;