From e9e598b9b2c5012a27ecc0651050c80d43f29010 Mon Sep 17 00:00:00 2001 From: Sonia Sharma Date: Fri, 31 Aug 2018 04:14:50 -0400 Subject: [PATCH] LU-11370 lnet: cleanup ni_cptlist With the changes added for the multi-rail feature, ni_cptlist related code was removed from lnet_startup_lndni() and other places. It lurked behind at few places, cleaning up from there with this patch Change-Id: Ied557802df4feb869cea57cb7f44724a550b1ec1 Test-Parameters: trivial Signed-off-by: Sonia Sharma Reviewed-on: https://review.whamcloud.com/33155 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Doug Oucharek Reviewed-by: Oleg Drokin --- lnet/include/lnet/lib-types.h | 3 --- lnet/lnet/api-ni.c | 5 ----- lnet/lnet/config.c | 1 - 3 files changed, 9 deletions(-) diff --git a/lnet/include/lnet/lib-types.h b/lnet/include/lnet/lib-types.h index 4ee8c60..3962bf3 100644 --- a/lnet/include/lnet/lib-types.h +++ b/lnet/include/lnet/lib-types.h @@ -413,9 +413,6 @@ struct lnet_ni { /* chain on the lnet_net structure */ struct list_head ni_netlist; - /* chain on net_ni_cpt */ - struct list_head ni_cptlist; - /* chain on the recovery queue */ struct list_head ni_recovery; diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c index acf349c..059aa41 100644 --- a/lnet/lnet/api-ni.c +++ b/lnet/lnet/api-ni.c @@ -1783,11 +1783,6 @@ lnet_ni_tq_credits(struct lnet_ni *ni) static void lnet_ni_unlink_locked(struct lnet_ni *ni) { - if (!list_empty(&ni->ni_cptlist)) { - list_del_init(&ni->ni_cptlist); - lnet_ni_decref_locked(ni, 0); - } - /* move it to zombie list and nobody can find it anymore */ LASSERT(!list_empty(&ni->ni_netlist)); list_move(&ni->ni_netlist, &ni->ni_net->net_ni_zombie); diff --git a/lnet/lnet/config.c b/lnet/lnet/config.c index ab314a3..077e435 100644 --- a/lnet/lnet/config.c +++ b/lnet/lnet/config.c @@ -456,7 +456,6 @@ lnet_ni_alloc_common(struct lnet_net *net, char *iface) } spin_lock_init(&ni->ni_lock); - INIT_LIST_HEAD(&ni->ni_cptlist); INIT_LIST_HEAD(&ni->ni_netlist); INIT_LIST_HEAD(&ni->ni_recovery); ni->ni_refs = cfs_percpt_alloc(lnet_cpt_table(), -- 1.8.3.1