net,rcu: convert call_rcu(netlbl_unlhsh_free_addr4) to kfree_rcu() (c3b49420) · Commits · 戴 / test

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

Lai Jiangshan <laijs@cn.fujitsu.com> Acked-by:

David S. Miller <davem@davemloft.net> Acked-by:

Paul Moore <paul.moore@hp.com> Signed-off-by:

Paul E. McKenney <paulmck@linux.vnet.ibm.com> Reviewed-by:

Josh Triplett <josh@joshtriplett.org>

net/netlabel/netlabel_unlabeled.c

+1 −19

Original line number	Diff line number	Diff line
		@@ -153,24 +153,6 @@ static const struct nla_policy netlbl_unlabel_genl_policy[NLBL_UNLABEL_A_MAX + 1
		* Unlabeled Connection Hash Table Functions
		*/

		/**
		* netlbl_unlhsh_free_addr4 - Frees an IPv4 address entry from the hash table
		* @entry: the entry's RCU field
		*
		* Description:
		* This function is designed to be used as a callback to the call_rcu()
		* function so that memory allocated to a hash table address entry can be
		* released safely.
		*
		*/
		static void netlbl_unlhsh_free_addr4(struct rcu_head *entry)
		{
		struct netlbl_unlhsh_addr4 *ptr;

		ptr = container_of(entry, struct netlbl_unlhsh_addr4, rcu);
		kfree(ptr);
		}

		#if defined(CONFIG_IPV6) \|\| defined(CONFIG_IPV6_MODULE)
		/**
		* netlbl_unlhsh_free_addr6 - Frees an IPv6 address entry from the hash table
		@@ -568,7 +550,7 @@ static int netlbl_unlhsh_remove_addr4(struct net *net,
		if (entry == NULL)
		return -ENOENT;

		call_rcu(&entry->rcu, netlbl_unlhsh_free_addr4);
		kfree_rcu(entry, rcu);
		return 0;
		}

Admin message