Re: [tipc-discussion] [net-next] tipc: remove dead code in tipc_net and relatives

[Ying X. <yin...@wi...>]

On 10/9/20 1:14 PM, Hoang Huu Le wrote:
> dist_queue is no longer used since commit 37922ea4a310
> ("tipc: permit overlapping service ranges in name table")
> 
> Signed-off-by: Hoang Huu Le <hoa...@de...>

Acked-by: Ying Xue <yin...@wi...>

> ---
>  net/tipc/core.c       |  2 --
>  net/tipc/core.h       |  3 ---
>  net/tipc/name_distr.c | 19 -------------------
>  3 files changed, 24 deletions(-)
> 
> diff --git a/net/tipc/core.c b/net/tipc/core.c
> index c2ff42900b53..5cc1f0307215 100644
> --- a/net/tipc/core.c
> +++ b/net/tipc/core.c
> @@ -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;
> diff --git a/net/tipc/core.h b/net/tipc/core.h
> index 1d57a4d3b05e..df34dcdd0607 100644
> --- a/net/tipc/core.h
> +++ b/net/tipc/core.h
> @@ -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;
> diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c
> index 2f9c148f17e2..4d50798fe36c 100644
> --- a/net/tipc/name_distr.c
> +++ b/net/tipc/name_distr.c
> @@ -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--;
>