Commit 6b262232 authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Paul E. McKenney
Browse files

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



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

Signed-off-by: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: default avatarPaul Moore <paul.moore@hp.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent c3b49420

net/netlabel/netlabel_unlabeled.c

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

 */



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

/**

 * netlbl_unlhsh_free_addr6 - Frees an IPv6 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_addr6(struct rcu_head *entry)

{

	struct netlbl_unlhsh_addr6 *ptr;



	ptr = container_of(entry, struct netlbl_unlhsh_addr6, rcu);

	kfree(ptr);

}

#endif /* IPv6 */



/**

 * netlbl_unlhsh_free_iface - Frees an interface entry from the hash table

 * @entry: the entry's RCU field
@@ -611,7 +591,7 @@ static int netlbl_unlhsh_remove_addr6(struct net *net, 
	if (entry == NULL)

		return -ENOENT;



	call_rcu(&entry->rcu, netlbl_unlhsh_free_addr6);

	kfree_rcu(entry, rcu);

	return 0;

}

#endif /* IPv6 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE