diff options
author | Jon Paul Maloy <jon.maloy@ericsson.com> | 2015-02-03 08:59:18 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-04 16:09:31 -0800 |
commit | 7d24dcdb3f3132e0ec36f19c49bd004bc874b8aa (patch) | |
tree | e42789818fc429ba6709f98732c7f6a31d5013b3 /net/tipc/link.h | |
parent | 2d72d49553d8de113d4eb1f69b2291f449a4c6bc (diff) | |
download | linux-stable-7d24dcdb3f3132e0ec36f19c49bd004bc874b8aa.tar.gz linux-stable-7d24dcdb3f3132e0ec36f19c49bd004bc874b8aa.tar.bz2 linux-stable-7d24dcdb3f3132e0ec36f19c49bd004bc874b8aa.zip |
tipc: avoid stale link after aborted failover
During link failover it may happen that the remaining link goes
down while it is still in the process of taking over traffic
from a previously failed link. When this happens, we currently
abort the failover procedure and reset the first failed link to
non-failover mode, so that it will be ready to re-establish
contact with its peer when it comes available.
However, if the first link goes down because its bearer was manually
disabled, it is not enough to reset it; it must also be deleted;
which is supposed to happen when the failover procedure is finished.
Otherwise it will remain a zombie link: attached to the owner node
structure, in mode LINK_STOPPED, and permanently blocking any re-
establishing of the link to the peer via the interface in question.
We fix this by amending the failover abort procedure. Apart from
resetting the link to non-failover state, we test if the link is
also in LINK_STOPPED mode. If so, we delete it, using the conditional
tipc_link_delete() function introduced in the previous commit.
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/link.h')
-rw-r--r-- | net/tipc/link.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tipc/link.h b/net/tipc/link.h index f06b779c9f75..3e3432b3044e 100644 --- a/net/tipc/link.h +++ b/net/tipc/link.h @@ -202,6 +202,7 @@ struct tipc_port; struct tipc_link *tipc_link_create(struct tipc_node *n_ptr, struct tipc_bearer *b_ptr, const struct tipc_media_addr *media_addr); +void tipc_link_delete(struct tipc_link *link); void tipc_link_delete_list(struct net *net, unsigned int bearer_id, bool shutting_down); void tipc_link_failover_send_queue(struct tipc_link *l_ptr); |