Skip to content

Commit

Permalink
tipc: remove dead code in tipc_net and relatives
Browse files Browse the repository at this point in the history
dist_queue is no longer used since commit 37922ea
("tipc: permit overlapping service ranges in name table")

Acked-by: Jon Maloy <jmaloy@redhat.com>
Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Hoang Huu Le <hoang.h.le@dektech.com.au>
Link: https://lore.kernel.org/r/20201028032712.31009-1-hoang.h.le@dektech.com.au
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Hoang Huu Le authored and Jakub Kicinski committed Oct 30, 2020
1 parent 8da1f44 commit 09b5678
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 24 deletions.
2 changes: 0 additions & 2 deletions net/tipc/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions net/tipc/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
19 changes: 0 additions & 19 deletions net/tipc/name_distr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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--;
Expand Down

0 comments on commit 09b5678

Please sign in to comment.