mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 15:01:13 +07:00
net/hsr: using kfree_rcu() to simplify the code
The callback function of call_rcu() just calls a kfree(), so we can use kfree_rcu() instead of call_rcu() + callback function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Acked-by: Arvid Brodin <arvid.brodin@alten.se> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
7271174fbc
commit
1aee6cc2a5
@ -127,11 +127,6 @@ int hsr_create_self_node(struct list_head *self_node_db,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void node_entry_reclaim(struct rcu_head *rh)
|
||||
{
|
||||
kfree(container_of(rh, struct node_entry, rcu_head));
|
||||
}
|
||||
|
||||
|
||||
/* Add/merge node to the database of nodes. 'skb' must contain an HSR
|
||||
* supervision frame.
|
||||
@ -175,7 +170,7 @@ struct node_entry *hsr_merge_node(struct hsr_priv *hsr_priv,
|
||||
if (node && !ether_addr_equal(node->MacAddressA, hsr_sp->MacAddressA)) {
|
||||
/* Node has changed its AddrA, frame was received from SlaveB */
|
||||
list_del_rcu(&node->mac_list);
|
||||
call_rcu(&node->rcu_head, node_entry_reclaim);
|
||||
kfree_rcu(node, rcu_head);
|
||||
node = NULL;
|
||||
}
|
||||
|
||||
@ -183,7 +178,7 @@ struct node_entry *hsr_merge_node(struct hsr_priv *hsr_priv,
|
||||
!ether_addr_equal(node->MacAddressB, hsr_ethsup->ethhdr.h_source)) {
|
||||
/* Cables have been swapped */
|
||||
list_del_rcu(&node->mac_list);
|
||||
call_rcu(&node->rcu_head, node_entry_reclaim);
|
||||
kfree_rcu(node, rcu_head);
|
||||
node = NULL;
|
||||
}
|
||||
|
||||
@ -192,7 +187,7 @@ struct node_entry *hsr_merge_node(struct hsr_priv *hsr_priv,
|
||||
!ether_addr_equal(node->MacAddressA, hsr_ethsup->ethhdr.h_source)) {
|
||||
/* Cables have been swapped */
|
||||
list_del_rcu(&node->mac_list);
|
||||
call_rcu(&node->rcu_head, node_entry_reclaim);
|
||||
kfree_rcu(node, rcu_head);
|
||||
node = NULL;
|
||||
}
|
||||
|
||||
@ -417,7 +412,7 @@ void hsr_prune_nodes(struct hsr_priv *hsr_priv)
|
||||
hsr_nl_nodedown(hsr_priv, node->MacAddressA);
|
||||
list_del_rcu(&node->mac_list);
|
||||
/* Note that we need to free this entry later: */
|
||||
call_rcu(&node->rcu_head, node_entry_reclaim);
|
||||
kfree_rcu(node, rcu_head);
|
||||
}
|
||||
}
|
||||
rcu_read_unlock();
|
||||
|
Loading…
Reference in New Issue
Block a user