Skip to content

Commit

Permalink
tipc: Eliminate alteration of publication key during name table purging
Browse files Browse the repository at this point in the history
Removes code that alters the publication key of a name table entry
that is being forcibly purged from TIPC's name table after contact
with the publishing node has been lost.

Current TIPC ensures that all defunct names are purged before
re-establishing contact with a failed node.  There used to be a risk
that the publication might be accidentally deleted because it might be
re-added to the name table before the purge operation was completed.
But now there is no longer a need to ensure that the new key is different
than the old one.

Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
  • Loading branch information
Allan Stephens authored and Paul Gortmaker committed Feb 6, 2012
1 parent 63e7f1a commit 3175bd9
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions net/tipc/name_distr.c
Original file line number Diff line number Diff line change
Expand Up @@ -239,17 +239,13 @@ void tipc_named_node_up(unsigned long nodearg)
*
* Invoked for each publication issued by a newly failed node.
* Removes publication structure from name table & deletes it.
* In rare cases the link may have come back up again when this
* function is called, and we have two items representing the same
* publication. Nudge this item's key to distinguish it from the other.
*/

static void named_purge_publ(struct publication *publ)
{
struct publication *p;

write_lock_bh(&tipc_nametbl_lock);
publ->key += 1222345;
p = tipc_nametbl_remove_publ(publ->type, publ->lower,
publ->node, publ->ref, publ->key);
if (p)
Expand Down

0 comments on commit 3175bd9

Please sign in to comment.