lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Lai Jiangshan <laijs@cn.fujitsu.com>
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>
This commit is contained in:
Lai Jiangshan
2011-03-18 12:04:50 +08:00
committed by Paul E. McKenney
parent c3b494209c
commit 6b26223281
1 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
net/netlabel/netlabel_unlabeled.c
View File

@@ -153,26 +153,6 @@ static const struct nla_policy netlbl_unlabel_genl_policy[NLBL_UNLABEL_A_MAX + 1
* Unlabeled Connection Hash Table Functions * 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 * netlbl_unlhsh_free_iface - Frees an interface entry from the hash table
* @entry: the entry's RCU field * @entry: the entry's RCU field
@@ -611,7 +591,7 @@ static int netlbl_unlhsh_remove_addr6(struct net *net,
if (entry == NULL) if (entry == NULL)
return -ENOENT; return -ENOENT;
call_rcu(&entry->rcu, netlbl_unlhsh_free_addr6); kfree_rcu(entry, rcu);
return 0; return 0;
} }
#endif /* IPv6 */ #endif /* IPv6 */