Acked-by: Jon
> -----Original Message-----
> From: Hoang Le <hoang.h...@dektech.com.au>
> Sent: 6-Nov-19 01:26
> To: Jon Maloy <jon.ma...@ericsson.com>; ma...@donjonn.com;
> net...@vger.kernel.org; tipc-
> discuss...@lists.sourceforge.net
> Subject: [net-next 1/2] tipc: update cluster capabilities if node deleted
>
> There are two improvements when re-calculate cluster capabilities:
>
> - When deleting a specific down node, need to re-calculate.
> - In tipc_node_cleanup(), do not need to re-calculate if node
> is still existing in cluster.
>
> Acked-by: Jon Maloy <jon.ma...@ericsson.com>
> Signed-off-by: Hoang Le <hoang.h...@dektech.com.au>
> ---
> net/tipc/node.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/net/tipc/node.c b/net/tipc/node.c
> index 742c04756d72..a20fabd09e7e 100644
> --- a/net/tipc/node.c
> +++ b/net/tipc/node.c
> @@ -665,6 +665,11 @@ static bool tipc_node_cleanup(struct tipc_node *peer)
> }
> tipc_node_write_unlock(peer);
>
> + if (!deleted) {
> + spin_unlock_bh(&tn->node_list_lock);
> + return deleted;
> + }
> +
> /* Calculate cluster capabilities */
> tn->capabilities = TIPC_NODE_CAPABILITIES;
> list_for_each_entry_rcu(temp_node, &tn->node_list, list) {
> @@ -2041,7 +2046,7 @@ int tipc_nl_peer_rm(struct sk_buff *skb, struct
> genl_info *info)
> struct net *net = sock_net(skb->sk);
> struct tipc_net *tn = net_generic(net, tipc_net_id);
> struct nlattr *attrs[TIPC_NLA_NET_MAX + 1];
> - struct tipc_node *peer;
> + struct tipc_node *peer, *temp_node;
> u32 addr;
> int err;
>
> @@ -2082,6 +2087,11 @@ int tipc_nl_peer_rm(struct sk_buff *skb, struct
> genl_info *info)
> tipc_node_write_unlock(peer);
> tipc_node_delete(peer);
>
> + /* Calculate cluster capabilities */
> + tn->capabilities = TIPC_NODE_CAPABILITIES;
> + list_for_each_entry_rcu(temp_node, &tn->node_list, list) {
> + tn->capabilities &= temp_node->capabilities;
> + }
> err = 0;
> err_out:
> tipc_node_put(peer);
> --
> 2.20.1
_______________________________________________
tipc-discussion mailing list
tipc-discussion@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tipc-discussion
