tipc: use standard write_lock & unlock functions when creating node
authorJon Maloy <jon.maloy@ericsson.com>
Thu, 11 Apr 2019 19:56:28 +0000 (21:56 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 11 Apr 2019 20:42:35 +0000 (13:42 -0700)
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: 40999f11ce67 ("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>
net/tipc/node.c

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