diff options
author | Allan Stephens <allan.stephens@windriver.com> | 2011-11-09 14:22:52 -0500 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-04-19 15:46:37 -0400 |
commit | fd6eced8a482986784eb1f3aa0838dbdd725e71c (patch) | |
tree | edc9022ebdf66681e1847b1c0e968b3faa5a44ea | |
parent | 1110b8d33a54d1b91131e2a70ef0c3c26425b800 (diff) |
tipc: Don't record failed publication attempt as a success
No longer increments counter of number of publications by a node
if an attempt to add a new publication fails. This prevents TIPC from
incorrectly blocking future publications because the configured maximum
number of publications has been reached.
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r-- | net/tipc/name_table.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c index bd80d80fb112..5d7004262647 100644 --- a/net/tipc/name_table.c +++ b/net/tipc/name_table.c | |||
@@ -695,11 +695,12 @@ struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper, | |||
695 | } | 695 | } |
696 | 696 | ||
697 | write_lock_bh(&tipc_nametbl_lock); | 697 | write_lock_bh(&tipc_nametbl_lock); |
698 | table.local_publ_count++; | ||
699 | publ = tipc_nametbl_insert_publ(type, lower, upper, scope, | 698 | publ = tipc_nametbl_insert_publ(type, lower, upper, scope, |
700 | tipc_own_addr, port_ref, key); | 699 | tipc_own_addr, port_ref, key); |
701 | if (likely(publ)) | 700 | if (likely(publ)) { |
701 | table.local_publ_count++; | ||
702 | tipc_named_publish(publ); | 702 | tipc_named_publish(publ); |
703 | } | ||
703 | write_unlock_bh(&tipc_nametbl_lock); | 704 | write_unlock_bh(&tipc_nametbl_lock); |
704 | return publ; | 705 | return publ; |
705 | } | 706 | } |