Merge ../linux-2.6/

[sfrench/cifs-2.6.git] / net / tipc / name_distr.c

diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c
index 830f9099904182daa81dc9e2b76151c81570546e..f0b063bcc2a9982c36b7b65bd51bcb3c7ec3a610 100644 (file)
--- a/net/tipc/name_distr.c
+++ b/net/tipc/name_distr.c
@@ -127,7 +127,7 @@ void tipc_named_publish(struct publication *publ)
 
        buf = named_prepare_buf(PUBLICATION, ITEM_SIZE, 0);
        if (!buf) {
-               warn("Memory squeeze; failed to distribute publication\n");
+               warn("Publication distribution failure\n");
                return;
        }
 
@@ -151,7 +151,7 @@ void tipc_named_withdraw(struct publication *publ)
 
        buf = named_prepare_buf(WITHDRAWAL, ITEM_SIZE, 0);
        if (!buf) {
-               warn("Memory squeeze; failed to distribute withdrawal\n");
+               warn("Withdrawl distribution failure\n");
                return;
        }
 
@@ -168,13 +168,12 @@ void tipc_named_withdraw(struct publication *publ)
 void tipc_named_node_up(unsigned long node)
 {
        struct publication *publ;
-       struct distr_item *item = 0;
-       struct sk_buff *buf = 0;
+       struct distr_item *item = NULL;
+       struct sk_buff *buf = NULL;
        u32 left = 0;
        u32 rest;
        u32 max_item_buf;
 
-       assert(in_own_cluster(node));
        read_lock_bh(&tipc_nametbl_lock); 
        max_item_buf = TIPC_MAX_USER_MSG_SIZE / ITEM_SIZE;
        max_item_buf *= ITEM_SIZE;
@@ -185,8 +184,8 @@ void tipc_named_node_up(unsigned long node)
                        left = (rest <= max_item_buf) ? rest : max_item_buf;
                        rest -= left;
                        buf = named_prepare_buf(PUBLICATION, left, node);       
-                       if (buf == NULL) {
-                               warn("Memory Squeeze; could not send publication\n");
+                       if (!buf) {
+                               warn("Bulk publication distribution failure\n");
                                goto exit;
                        }
                        item = (struct distr_item *)msg_data(buf_msg(buf));
@@ -200,7 +199,7 @@ void tipc_named_node_up(unsigned long node)
                            "<%u.%u.%u>\n", tipc_zone(node), 
                            tipc_cluster(node), tipc_node(node));
                        tipc_link_send(buf, node, node);
-                       buf = 0;
+                       buf = NULL;
                }
        }
 exit:
@@ -221,16 +220,24 @@ exit:
 static void node_is_down(struct publication *publ)
 {
        struct publication *p;
+
         write_lock_bh(&tipc_nametbl_lock);
        dbg("node_is_down: withdrawing %u, %u, %u\n", 
            publ->type, publ->lower, publ->upper);
         publ->key += 1222345;
        p = tipc_nametbl_remove_publ(publ->type, publ->lower, 
                                     publ->node, publ->ref, publ->key);
-        assert(p == publ);
        write_unlock_bh(&tipc_nametbl_lock);
-       if (publ)
-               kfree(publ);
+
+        if (p != publ) {
+               err("Unable to remove publication from failed node\n"
+                   "(type=%u, lower=%u, node=0x%x, ref=%u, key=%u)\n",
+                   publ->type, publ->lower, publ->node, publ->ref, publ->key);
+       }
+
+       if (p) {
+               kfree(p);
+       }
 }
 
 /**
@@ -276,9 +283,15 @@ void tipc_named_recv(struct sk_buff *buf)
                        if (publ) {
                                tipc_nodesub_unsubscribe(&publ->subscr);
                                kfree(publ);
+                       } else {
+                               err("Unable to remove publication by node 0x%x\n"
+                                   "(type=%u, lower=%u, ref=%u, key=%u)\n",
+                                   msg_orignode(msg),
+                                   ntohl(item->type), ntohl(item->lower),
+                                   ntohl(item->ref), ntohl(item->key));
                        }
                } else {
-                       warn("tipc_named_recv: unknown msg\n");
+                       warn("Unrecognized name table message received\n");
                }
                item++;
        }