diff options
| author | Erik Hugne <erik.hugne@gmail.com> | 2016-04-07 10:40:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-11 15:22:20 -0400 |
| commit | ddb1d33969ef52687ad00f75eecf87029f62e382 (patch) | |
| tree | 6863f3e9a8ef3b08c199ddf13481ce967ff5c448 | |
| parent | 541726abe7daca64390c2ec34e6a203145f1686d (diff) | |
| download | linux-stable-ddb1d33969ef52687ad00f75eecf87029f62e382.tar.gz linux-stable-ddb1d33969ef52687ad00f75eecf87029f62e382.tar.bz2 linux-stable-ddb1d33969ef52687ad00f75eecf87029f62e382.zip | |
tipc: purge deferred updates from dead nodes
If a peer node becomes unavailable, in addition to removing the
nametable entries from this node we also need to purge all deferred
updates associated with this node.
Signed-off-by: Erik Hugne <erik.hugne@gmail.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/tipc/name_distr.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c index 4f4f5810f223..6b626a64b517 100644 --- a/net/tipc/name_distr.c +++ b/net/tipc/name_distr.c @@ -224,12 +224,31 @@ static void tipc_publ_purge(struct net *net, struct publication *publ, u32 addr) kfree_rcu(p, rcu); } +/** + * tipc_dist_queue_purge - remove deferred updates from a node that went down + */ +static void tipc_dist_queue_purge(struct net *net, u32 addr) +{ + struct tipc_net *tn = net_generic(net, tipc_net_id); + struct distr_queue_item *e, *tmp; + + spin_lock_bh(&tn->nametbl_lock); + list_for_each_entry_safe(e, tmp, &tn->dist_queue, next) { + if (e->node != addr) + continue; + list_del(&e->next); + kfree(e); + } + spin_unlock_bh(&tn->nametbl_lock); +} + void tipc_publ_notify(struct net *net, struct list_head *nsub_list, u32 addr) { struct publication *publ, *tmp; list_for_each_entry_safe(publ, tmp, nsub_list, nodesub_list) tipc_publ_purge(net, publ, addr); + tipc_dist_queue_purge(net, addr); } /** |