tipc: Don't record failed publication attempt as a success
authorAllan Stephens <allan.stephens@windriver.com>
Wed, 9 Nov 2011 19:22:52 +0000 (14:22 -0500)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Thu, 19 Apr 2012 19:46:37 +0000 (15:46 -0400)
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>
net/tipc/name_table.c

index bd80d80fb112524d6a3da01bd1e7ab9673a2e5b8..5d700426264774adc6a963f6437f404a2a022d36 100644 (file)
@@ -695,11 +695,12 @@ struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper,
        }
 
        write_lock_bh(&tipc_nametbl_lock);
-       table.local_publ_count++;
        publ = tipc_nametbl_insert_publ(type, lower, upper, scope,
                                   tipc_own_addr, port_ref, key);
-       if (likely(publ))
+       if (likely(publ)) {
+               table.local_publ_count++;
                tipc_named_publish(publ);
+       }
        write_unlock_bh(&tipc_nametbl_lock);
        return publ;
 }