Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

net,rcu: convert call_rcu(ipv6_mc_socklist_reclaim) to kfree_rcu() 

The rcu callback ipv6_mc_socklist_reclaim() just calls a kfree(),
so we use kfree_rcu() instead of the call_rcu(ipv6_mc_socklist_reclaim).

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
This commit is contained in:
Lai Jiangshan 2011-03-18 12:00:50 +08:00 committed by Paul E. McKenney
parent 6e070aecd9
commit e3cbf28fa6
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/ipv6/mcast.c
View File

@ -201,10 +201,6 @@ int ipv6_sock_mc_join(struct sock *sk, int ifindex, const struct in6_addr *addr)
return 0;
}
static void ipv6_mc_socklist_reclaim(struct rcu_head *head)
{
kfree(container_of(head, struct ipv6_mc_socklist, rcu));
}
/*
* socket leave on multicast group
*/
@ -239,7 +235,7 @@ int ipv6_sock_mc_drop(struct sock *sk, int ifindex, const struct in6_addr *addr)
(void) ip6_mc_leave_src(sk, mc_lst, NULL);
rcu_read_unlock();
atomic_sub(sizeof(*mc_lst), &sk->sk_omem_alloc);
call_rcu(&mc_lst->rcu, ipv6_mc_socklist_reclaim);
kfree_rcu(mc_lst, rcu);
return 0;
}
}
@ -307,7 +303,7 @@ void ipv6_sock_mc_close(struct sock *sk)
rcu_read_unlock();
atomic_sub(sizeof(*mc_lst), &sk->sk_omem_alloc);
call_rcu(&mc_lst->rcu, ipv6_mc_socklist_reclaim);
kfree_rcu(mc_lst, rcu);
spin_lock(&ipv6_sk_mc_lock);
}