diff options
| author | Jon Paul Maloy | 2014-02-14 22:40:44 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-02-17 06:26:34 +0100 |
| commit | a11607f5a145818e097c64c72c839bcf6907e110 (patch) | |
| tree | 2ecb1489a066f5010de35befe3a0f3ff0a3c80b3 /net/tipc/link.c | |
| parent | tipc: fix a loop style problem (diff) | |
| download | kernel-qcow2-linux-a11607f5a145818e097c64c72c839bcf6907e110.tar.gz kernel-qcow2-linux-a11607f5a145818e097c64c72c839bcf6907e110.tar.xz kernel-qcow2-linux-a11607f5a145818e097c64c72c839bcf6907e110.zip | |
tipc: correct usage of spin_lock() vs spin_lock_bh()
I commit e099e86c9e24fe9aff36773600543eb31d8954d
("tipc: add node_lock protection to link lookup function")
we are calling spin_lock(&node->lock) directly instead of indirectly
via the tipc_node_lock(node) function. However, tipc_node_lock() is
using spin_lock_bh(), not spin_lock(), something leading to
unbalanced usage in one place, and a smatch warning.
We fix this by consistently using tipc_node_lock()/unlock() in
in the places touched by the mentioned commit.
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/link.c')
| -rw-r--r-- | net/tipc/link.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index 4fb4ae0a75ed..5422e96014e2 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -2410,7 +2410,7 @@ static struct tipc_node *tipc_link_find_owner(const char *link_name, *bearer_id = 0; list_for_each_entry_safe(n_ptr, tmp_n_ptr, &tipc_node_list, list) { - spin_lock(&n_ptr->lock); + tipc_node_lock(n_ptr); for (i = 0; i < MAX_BEARERS; i++) { l_ptr = n_ptr->links[i]; if (l_ptr && !strcmp(l_ptr->name, link_name)) { @@ -2419,7 +2419,7 @@ static struct tipc_node *tipc_link_find_owner(const char *link_name, break; } } - spin_unlock(&n_ptr->lock); + tipc_node_unlock(n_ptr); if (found_node) break; } @@ -2603,7 +2603,7 @@ struct sk_buff *tipc_link_cmd_reset_stats(const void *req_tlv_area, int req_tlv_ read_unlock_bh(&tipc_net_lock); return tipc_cfg_reply_error_string("link not found"); } - spin_lock(&node->lock); + tipc_node_lock(node); l_ptr = node->links[bearer_id]; if (!l_ptr) { tipc_node_unlock(node); |