hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tipc: use standard write_lock & unlock functions when creating node 

In the function tipc_node_create() we protect the peer capability field
by using the node rw_lock. However, we access the lock directly instead
of using the dedicated functions for this, as we do everywhere else in
node.c. This cosmetic spot is fixed here.

Fixes: 40999f11ce ("tipc: make link capability update thread safe")
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jon Maloy 2019-04-11 21:56:28 +02:00 committed by David S. Miller
parent 9e35552ae1
commit 909620ff72
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/tipc/node.c
View File

@ -375,14 +375,15 @@ static struct tipc_node *tipc_node_create(struct net *net, u32 addr,
if (n->capabilities == capabilities) if (n->capabilities == capabilities)
goto exit; goto exit;
/* Same node may come back with new capabilities */ /* Same node may come back with new capabilities */
write_lock_bh(&n->lock); tipc_node_write_lock(n);
n->capabilities = capabilities; n->capabilities = capabilities;
for (bearer_id = 0; bearer_id < MAX_BEARERS; bearer_id++) { for (bearer_id = 0; bearer_id < MAX_BEARERS; bearer_id++) {
l = n->links[bearer_id].link; l = n->links[bearer_id].link;
if (l) if (l)
tipc_link_update_caps(l, capabilities); tipc_link_update_caps(l, capabilities);
} }
write_unlock_bh(&n->lock); tipc_node_write_unlock_fast(n);
/* Calculate cluster capabilities */ /* Calculate cluster capabilities */
tn->capabilities = TIPC_NODE_CAPABILITIES; tn->capabilities = TIPC_NODE_CAPABILITIES;
list_for_each_entry_rcu(temp_node, &tn->node_list, list) { list_for_each_entry_rcu(temp_node, &tn->node_list, list) {