tipc: simplify relationship between name table lock and node lock

When tipc name sequence is published, name table lock is released
before name sequence buffer is delivered to remote nodes through its
underlying unicast links. However, when name sequence is withdrawn,
the name table lock is held until the transmission of the removal
message of name sequence is finished. During the process, node lock
is nested in name table lock. To prevent node lock from being nested
in name table lock, while withdrawing name, we should adopt the same
locking policy of publishing name sequence: name table lock should
be released before message is sent.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Tested-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 93bac40292c13c27751df163777a52bd9a39f50f..bc3e7ed800008b2a14378f5ec35469746610a72d 100644 (file)
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -685,27 +685,28 @@ struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper,
 int tipc_nametbl_withdraw(u32 type, u32 lower, u32 ref, u32 key)
 {
        struct publication *publ;
-       struct sk_buff *buf;
+       struct sk_buff *skb = NULL;
 
        write_lock_bh(&tipc_nametbl_lock);
        publ = tipc_nametbl_remove_publ(type, lower, tipc_own_addr, ref, key);
        if (likely(publ)) {
                tipc_nametbl->local_publ_count--;
-               buf = tipc_named_withdraw(publ);
+               skb = tipc_named_withdraw(publ);
                /* Any pending external events? */
                tipc_named_process_backlog();
-               write_unlock_bh(&tipc_nametbl_lock);
                list_del_init(&publ->pport_list);
                kfree(publ);
+       } else {
+               pr_err("Unable to remove local publication\n"
+                      "(type=%u, lower=%u, ref=%u, key=%u)\n",
+                      type, lower, ref, key);
+       }
+       write_unlock_bh(&tipc_nametbl_lock);
 
-               if (buf)
-                       named_cluster_distribute(buf);
+       if (skb) {
+               named_cluster_distribute(skb);
                return 1;
        }
-       write_unlock_bh(&tipc_nametbl_lock);
-       pr_err("Unable to remove local publication\n"
-              "(type=%u, lower=%u, ref=%u, key=%u)\n",
-              type, lower, ref, key);
        return 0;
 }