From 764d2e9aedb7b12555ecc60449169018bd2b7b9b Mon Sep 17 00:00:00 2001 From: James Simmons Date: Mon, 15 Feb 2016 10:25:48 -0500 Subject: [PATCH] staging: lustre: eliminate obsolete Cray SeaStar support Remove the bulk of code for the no longer supported SeaStar interconnect found on older Cray systems. Signed-off-by: James Simmons Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-1422 Reviewed-on: http://review.whamcloud.com/7469 Reviewed-by: Liang Zhen Reviewed-by: Doug Oucharek Reviewed-by: Chuck Fossen Reviewed-by: Oleg Drokin Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lnet/lnet/router.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c index 735a8f2bdba4..9c32a01db329 100644 --- a/drivers/staging/lustre/lnet/lnet/router.c +++ b/drivers/staging/lustre/lnet/lnet/router.c @@ -635,7 +635,6 @@ lnet_parse_rc_info(lnet_rc_data_t *rcd) return; /* can't carry NI status info */ list_for_each_entry(rtr, &gw->lp_routes, lr_gwlist) { - int ptl_status = LNET_NI_STATUS_INVALID; int down = 0; int up = 0; int i; @@ -655,10 +654,7 @@ lnet_parse_rc_info(lnet_rc_data_t *rcd) continue; if (stat->ns_status == LNET_NI_STATUS_DOWN) { - if (LNET_NETTYP(LNET_NIDNET(nid)) != PTLLND) - down++; - else if (ptl_status != LNET_NI_STATUS_UP) - ptl_status = LNET_NI_STATUS_DOWN; + down++; continue; } @@ -667,12 +663,6 @@ lnet_parse_rc_info(lnet_rc_data_t *rcd) up = 1; break; } - /* - * ptl NIs are considered down only when - * they're all down - */ - if (LNET_NETTYP(LNET_NIDNET(nid)) == PTLLND) - ptl_status = LNET_NI_STATUS_UP; continue; } @@ -686,7 +676,7 @@ lnet_parse_rc_info(lnet_rc_data_t *rcd) rtr->lr_downis = 0; continue; } - rtr->lr_downis = down + (ptl_status == LNET_NI_STATUS_DOWN); + rtr->lr_downis = down; } } -- 2.34.1