Commit be07f056 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

tipc: simplify the finalize work queue 



This patch is to use "struct work_struct" for the finalize work queue
instead of "struct tipc_net_work", as it can get the "net" and "addr"
from tipc_net's other members and there is no need to add extra net
and addr in tipc_net by defining "struct tipc_net_work".

Note that it's safe to get net from tn->bcl as bcl is always released
after the finalize work queue is done.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Acked-by: default avatarJon Maloy <jmaloy@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1dde47a6

net/tipc/core.c

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int __net_init tipc_init_net(struct net *net) 
	tn->trial_addr = 0;

	tn->addr_trial_end = 0;

	tn->capabilities = TIPC_NODE_CAPABILITIES;

	INIT_WORK(&tn->final_work.work, tipc_net_finalize_work);

	INIT_WORK(&tn->work, tipc_net_finalize_work);

	memset(tn->node_id, 0, sizeof(tn->node_id));

	memset(tn->node_id_string, 0, sizeof(tn->node_id_string));

	tn->mon_threshold = TIPC_DEF_MON_THRESHOLD;
@@ -110,7 +110,7 @@ static void __net_exit tipc_exit_net(struct net *net) 


	tipc_detach_loopback(net);

	/* Make sure the tipc_net_finalize_work() finished */

	cancel_work_sync(&tn->final_work.work);

	cancel_work_sync(&tn->work);

	tipc_net_stop(net);



	tipc_bcast_stop(net);

net/tipc/core.h

+1 −7
Original line number Diff line number Diff line
@@ -91,12 +91,6 @@ extern unsigned int tipc_net_id __read_mostly; 
extern int sysctl_tipc_rmem[3] __read_mostly;

extern int sysctl_tipc_named_timeout __read_mostly;



struct tipc_net_work {

	struct work_struct work;

	struct net *net;

	u32 addr;

};



struct tipc_net {

	u8  node_id[NODE_ID_LEN];

	u32 node_addr;
@@ -148,7 +142,7 @@ struct tipc_net { 
	struct tipc_crypto *crypto_tx;

#endif

	/* Work item for net finalize */

	struct tipc_net_work final_work;

	struct work_struct work;

	/* The numbers of work queues in schedule */

	atomic_t wq_count;

};

net/tipc/discover.c

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static bool tipc_disc_addr_trial_msg(struct tipc_discoverer *d, 


	/* Apply trial address if we just left trial period */

	if (!trial && !self) {

		tipc_sched_net_finalize(net, tn->trial_addr);

		schedule_work(&tn->work);

		msg_set_prevnode(buf_msg(d->skb), tn->trial_addr);

		msg_set_type(buf_msg(d->skb), DSC_REQ_MSG);

	}
@@ -308,7 +308,7 @@ static void tipc_disc_timeout(struct timer_list *t) 
	if (!time_before(jiffies, tn->addr_trial_end) && !tipc_own_addr(net)) {

		mod_timer(&d->timer, jiffies + TIPC_DISC_INIT);

		spin_unlock_bh(&d->lock);

		tipc_sched_net_finalize(net, tn->trial_addr);

		schedule_work(&tn->work);

		return;

	}

net/tipc/link.c

+5 −0
Original line number Diff line number Diff line
@@ -372,6 +372,11 @@ char tipc_link_plane(struct tipc_link *l) 
	return l->net_plane;

}



struct net *tipc_link_net(struct tipc_link *l)

{

	return l->net;

}



void tipc_link_update_caps(struct tipc_link *l, u16 capabilities)

{

	l->peer_caps = capabilities;

net/tipc/link.h

+1 −0
Original line number Diff line number Diff line
@@ -156,4 +156,5 @@ int tipc_link_bc_sync_rcv(struct tipc_link *l, struct tipc_msg *hdr, 
int tipc_link_bc_nack_rcv(struct tipc_link *l, struct sk_buff *skb,

			  struct sk_buff_head *xmitq);

bool tipc_link_too_silent(struct tipc_link *l);

struct net *tipc_link_net(struct tipc_link *l);

#endif