Commit 6708ef77 authored by Hoang Le's avatar Hoang Le Committed by David S. Miller
Browse files

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: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarHoang Le <hoang.h.le@dektech.com.au>
Acked-by: Jon
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3c28d99f

net/tipc/node.c

+11 −1
Original line number Diff line number Diff line
@@ -667,6 +667,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) {
@@ -2043,7 +2048,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;
@@ -2084,6 +2089,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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE