net,rcu: convert call_rcu(ip_mc_socklist_reclaim) to kfree_rcu() (10d50e74) · Commits · 戴 / test

The rcu callback ip_mc_socklist_reclaim() just calls a kfree(), so we use kfree_rcu() instead of the call_rcu(ip_mc_socklist_reclaim). Signed-off-by:

net/ipv4/igmp.c

+2 −10

Original line number	Diff line number	Diff line
		@@ -1850,14 +1850,6 @@ static int ip_mc_leave_src(struct sock sk, struct ip_mc_socklist iml,
		return err;
		}


		static void ip_mc_socklist_reclaim(struct rcu_head *rp)
		{
		kfree(container_of(rp, struct ip_mc_socklist, rcu));
		/* sk_omem_alloc should have been decreased by the caller*/
		}


		/*
		* Ask a socket to leave a group.
		*/
		@@ -1897,7 +1889,7 @@ int ip_mc_leave_group(struct sock sk, struct ip_mreqn imr)
		rtnl_unlock();
		/* decrease mem now to avoid the memleak warning */
		atomic_sub(sizeof(*iml), &sk->sk_omem_alloc);
		call_rcu(&iml->rcu, ip_mc_socklist_reclaim);
		kfree_rcu(iml, rcu);
		return 0;
		}
		if (!in_dev)
		@@ -2312,7 +2304,7 @@ void ip_mc_drop_socket(struct sock *sk)
		ip_mc_dec_group(in_dev, iml->multi.imr_multiaddr.s_addr);
		/* decrease mem now to avoid the memleak warning */
		atomic_sub(sizeof(*iml), &sk->sk_omem_alloc);
		call_rcu(&iml->rcu, ip_mc_socklist_reclaim);
		kfree_rcu(iml, rcu);
		}
		rtnl_unlock();
		}