aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/name_distr.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/name_distr.c')
-rw-r--r--net/tipc/name_distr.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c
index 158318e67b08..55d3928dfd67 100644
--- a/net/tipc/name_distr.c
+++ b/net/tipc/name_distr.c
@@ -161,7 +161,7 @@ void tipc_named_publish(struct publication *publ)
161 161
162 buf = named_prepare_buf(PUBLICATION, ITEM_SIZE, 0); 162 buf = named_prepare_buf(PUBLICATION, ITEM_SIZE, 0);
163 if (!buf) { 163 if (!buf) {
164 warn("Publication distribution failure\n"); 164 pr_warn("Publication distribution failure\n");
165 return; 165 return;
166 } 166 }
167 167
@@ -186,7 +186,7 @@ void tipc_named_withdraw(struct publication *publ)
186 186
187 buf = named_prepare_buf(WITHDRAWAL, ITEM_SIZE, 0); 187 buf = named_prepare_buf(WITHDRAWAL, ITEM_SIZE, 0);
188 if (!buf) { 188 if (!buf) {
189 warn("Withdrawal distribution failure\n"); 189 pr_warn("Withdrawal distribution failure\n");
190 return; 190 return;
191 } 191 }
192 192
@@ -213,7 +213,7 @@ static void named_distribute(struct list_head *message_list, u32 node,
213 rest -= left; 213 rest -= left;
214 buf = named_prepare_buf(PUBLICATION, left, node); 214 buf = named_prepare_buf(PUBLICATION, left, node);
215 if (!buf) { 215 if (!buf) {
216 warn("Bulk publication failure\n"); 216 pr_warn("Bulk publication failure\n");
217 return; 217 return;
218 } 218 }
219 item = (struct distr_item *)msg_data(buf_msg(buf)); 219 item = (struct distr_item *)msg_data(buf_msg(buf));
@@ -283,9 +283,10 @@ static void named_purge_publ(struct publication *publ)
283 write_unlock_bh(&tipc_nametbl_lock); 283 write_unlock_bh(&tipc_nametbl_lock);
284 284
285 if (p != publ) { 285 if (p != publ) {
286 err("Unable to remove publication from failed node\n" 286 pr_err("Unable to remove publication from failed node\n"
287 "(type=%u, lower=%u, node=0x%x, ref=%u, key=%u)\n", 287 " (type=%u, lower=%u, node=0x%x, ref=%u, key=%u)\n",
288 publ->type, publ->lower, publ->node, publ->ref, publ->key); 288 publ->type, publ->lower, publ->node, publ->ref,
289 publ->key);
289 } 290 }
290 291
291 kfree(p); 292 kfree(p);
@@ -329,14 +330,14 @@ void tipc_named_recv(struct sk_buff *buf)
329 tipc_nodesub_unsubscribe(&publ->subscr); 330 tipc_nodesub_unsubscribe(&publ->subscr);
330 kfree(publ); 331 kfree(publ);
331 } else { 332 } else {
332 err("Unable to remove publication by node 0x%x\n" 333 pr_err("Unable to remove publication by node 0x%x\n"
333 "(type=%u, lower=%u, ref=%u, key=%u)\n", 334 " (type=%u, lower=%u, ref=%u, key=%u)\n",
334 msg_orignode(msg), 335 msg_orignode(msg), ntohl(item->type),
335 ntohl(item->type), ntohl(item->lower), 336 ntohl(item->lower), ntohl(item->ref),
336 ntohl(item->ref), ntohl(item->key)); 337 ntohl(item->key));
337 } 338 }
338 } else { 339 } else {
339 warn("Unrecognized name table message received\n"); 340 pr_warn("Unrecognized name table message received\n");
340 } 341 }
341 item++; 342 item++;
342 } 343 }