tipc: remove dead code in tipc_net and relatives (09b5678c) · Commits · 戴 / test

net/tipc/core.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -81,8 +81,6 @@ static int __net_init tipc_init_net(struct net *net)
		if (err)
		goto out_nametbl;

		INIT_LIST_HEAD(&tn->dist_queue);

		err = tipc_bcast_init(net);
		if (err)
		goto out_bclink;

+0 −3

Original line number	Diff line number	Diff line
		@@ -132,9 +132,6 @@ struct tipc_net {
		spinlock_t nametbl_lock;
		struct name_table *nametbl;

		/* Name dist queue */
		struct list_head dist_queue;

		/* Topology subscription server */
		struct tipc_topsrv *topsrv;
		atomic_t subscription_count;

+0 −19

Original line number	Diff line number	Diff line
		@@ -244,24 +244,6 @@ static void tipc_publ_purge(struct net net, struct publication publ, u32 addr)
		kfree_rcu(p, rcu);
		}

		/**
		* tipc_dist_queue_purge - remove deferred updates from a node that went down
		*/
		static void tipc_dist_queue_purge(struct net *net, u32 addr)
		{
		struct tipc_net *tn = net_generic(net, tipc_net_id);
		struct distr_queue_item e, tmp;

		spin_lock_bh(&tn->nametbl_lock);
		list_for_each_entry_safe(e, tmp, &tn->dist_queue, next) {
		if (e->node != addr)
		continue;
		list_del(&e->next);
		kfree(e);
		}
		spin_unlock_bh(&tn->nametbl_lock);
		}

		void tipc_publ_notify(struct net net, struct list_head nsub_list,
		u32 addr, u16 capabilities)
		{
		@@ -272,7 +254,6 @@ void tipc_publ_notify(struct net net, struct list_head nsub_list,

		list_for_each_entry_safe(publ, tmp, nsub_list, binding_node)
		tipc_publ_purge(net, publ, addr);
		tipc_dist_queue_purge(net, addr);
		spin_lock_bh(&tn->nametbl_lock);
		if (!(capabilities & TIPC_NAMED_BCAST))
		nt->rc_dests--;