Commit b1c29f6b authored by Jon Paul Maloy's avatar Jon Paul Maloy Committed by David S. Miller
Browse files

tipc: simplify resetting and disabling of bearers 



Since commit 4b475e3f2f8e4e241de101c8240f1d74d0470494
("tipc: eliminate delayed link deletion at link failover") the extra
boolean parameter "shutting_down" is not any longer needed for the
functions bearer_disable() and tipc_link_delete_list().

Furhermore, the function tipc_link_reset_links(), called from
bearer_reset()  is now unnecessary. We can just as well delete
all the links, as we do in bearer_disable(), and start over with
creating new links.

This commit introduces those changes.

Reviewed-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Reviewed-by: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c16ead79

net/tipc/bearer.c

+8 −10
Original line number Diff line number Diff line
@@ -71,8 +71,7 @@ static const struct nla_policy tipc_nl_media_policy[TIPC_NLA_MEDIA_MAX + 1] = { 
	[TIPC_NLA_MEDIA_PROP]		= { .type = NLA_NESTED }

};



static void bearer_disable(struct net *net, struct tipc_bearer *b_ptr,

			   bool shutting_down);

static void bearer_disable(struct net *net, struct tipc_bearer *b_ptr);



/**

 * tipc_media_find - locates specified media object by name
@@ -324,7 +323,7 @@ restart: 


	res = tipc_disc_create(net, b_ptr, &b_ptr->bcast_addr);

	if (res) {

		bearer_disable(net, b_ptr, false);

		bearer_disable(net, b_ptr);

		pr_warn("Bearer <%s> rejected, discovery object creation failed\n",

			name);

		return -EINVAL;
@@ -344,7 +343,7 @@ restart: 
static int tipc_reset_bearer(struct net *net, struct tipc_bearer *b_ptr)

{

	pr_info("Resetting bearer <%s>\n", b_ptr->name);

	tipc_link_reset_list(net, b_ptr->identity);

	tipc_link_delete_list(net, b_ptr->identity);

	tipc_disc_reset(net, b_ptr);

	return 0;

}
@@ -354,8 +353,7 @@ static int tipc_reset_bearer(struct net *net, struct tipc_bearer *b_ptr) 
 *

 * Note: This routine assumes caller holds RTNL lock.

 */

static void bearer_disable(struct net *net, struct tipc_bearer *b_ptr,

			   bool shutting_down)

static void bearer_disable(struct net *net, struct tipc_bearer *b_ptr)

{

	struct tipc_net *tn = net_generic(net, tipc_net_id);

	u32 i;
@@ -363,7 +361,7 @@ static void bearer_disable(struct net *net, struct tipc_bearer *b_ptr, 
	pr_info("Disabling bearer <%s>\n", b_ptr->name);

	b_ptr->media->disable_media(b_ptr);



	tipc_link_delete_list(net, b_ptr->identity, shutting_down);

	tipc_link_delete_list(net, b_ptr->identity);

	if (b_ptr->link_req)

		tipc_disc_delete(b_ptr->link_req);
@@ -541,7 +539,7 @@ static int tipc_l2_device_event(struct notifier_block *nb, unsigned long evt, 
		break;

	case NETDEV_UNREGISTER:

	case NETDEV_CHANGENAME:

		bearer_disable(dev_net(dev), b_ptr, false);

		bearer_disable(dev_net(dev), b_ptr);

		break;

	}

	return NOTIFY_OK;
@@ -583,7 +581,7 @@ void tipc_bearer_stop(struct net *net) 
	for (i = 0; i < MAX_BEARERS; i++) {

		b_ptr = rtnl_dereference(tn->bearer_list[i]);

		if (b_ptr) {

			bearer_disable(net, b_ptr, true);

			bearer_disable(net, b_ptr);

			tn->bearer_list[i] = NULL;

		}

	}
@@ -747,7 +745,7 @@ int tipc_nl_bearer_disable(struct sk_buff *skb, struct genl_info *info) 
		return -EINVAL;

	}



	bearer_disable(net, bearer, false);

	bearer_disable(net, bearer);

	rtnl_unlock();



	return 0;

net/tipc/link.c

+1 −19
Original line number Diff line number Diff line
@@ -311,8 +311,7 @@ void tipc_link_delete(struct tipc_link *l) 
	tipc_link_put(l);

}



void tipc_link_delete_list(struct net *net, unsigned int bearer_id,

			   bool shutting_down)

void tipc_link_delete_list(struct net *net, unsigned int bearer_id)

{

	struct tipc_net *tn = net_generic(net, tipc_net_id);

	struct tipc_link *link;
@@ -476,23 +475,6 @@ void tipc_link_reset(struct tipc_link *l_ptr) 
	link_reset_statistics(l_ptr);

}



void tipc_link_reset_list(struct net *net, unsigned int bearer_id)

{

	struct tipc_net *tn = net_generic(net, tipc_net_id);

	struct tipc_link *l_ptr;

	struct tipc_node *n_ptr;



	rcu_read_lock();

	list_for_each_entry_rcu(n_ptr, &tn->node_list, list) {

		tipc_node_lock(n_ptr);

		l_ptr = n_ptr->links[bearer_id];

		if (l_ptr)

			tipc_link_reset(l_ptr);

		tipc_node_unlock(n_ptr);

	}

	rcu_read_unlock();

}



static void link_activate(struct tipc_link *link)

{

	struct tipc_node *node = link->owner;

net/tipc/link.h

+1 −3
Original line number Diff line number Diff line
@@ -213,8 +213,7 @@ 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_delete_list(struct net *net, unsigned int bearer_id);

void tipc_link_failover_send_queue(struct tipc_link *l_ptr);

void tipc_link_dup_queue_xmit(struct tipc_link *l_ptr, struct tipc_link *dest);

void tipc_link_reset_fragments(struct tipc_link *l_ptr);
@@ -223,7 +222,6 @@ int tipc_link_is_active(struct tipc_link *l_ptr); 
void tipc_link_purge_queues(struct tipc_link *l_ptr);

void tipc_link_reset_all(struct tipc_node *node);

void tipc_link_reset(struct tipc_link *l_ptr);

void tipc_link_reset_list(struct net *net, unsigned int bearer_id);

int tipc_link_xmit_skb(struct net *net, struct sk_buff *skb, u32 dest,

		       u32 selector);

int tipc_link_xmit(struct net *net, struct sk_buff_head *list, u32 dest,

CRA Git | Maintained and supported by SUSTech CRA and CCSE