From: Chris Horn Date: Mon, 22 Feb 2016 22:29:24 +0000 (-0500) Subject: staging: lustre: Use lnet_is_route_alive for router aliveness X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e9f259192f0a5c4915f6b50f19e9b401db782311;p=linux-beck.git staging: lustre: Use lnet_is_route_alive for router aliveness lctl show_route and lctl route_list will output router aliveness information via lnet_get_route(). lnet_get_route() should use the lnet_is_route_alive() function, introduced in e8a1124 http://review.whamcloud.com/7857, to determine route aliveness. Signed-off-by: Chris Horn Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5733 Reviewed-on: http://review.whamcloud.com/14055 Reviewed-by: James Simmons Reviewed-by: Amir Shehata Reviewed-by: Oleg Drokin Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c index 198ff03156c1..5a6086b0069c 100644 --- a/drivers/staging/lustre/lnet/lnet/router.c +++ b/drivers/staging/lustre/lnet/lnet/router.c @@ -607,8 +607,7 @@ lnet_get_route(int idx, __u32 *net, __u32 *hops, *hops = route->lr_hops; *priority = route->lr_priority; *gateway = route->lr_gateway->lp_nid; - *alive = route->lr_gateway->lp_alive && - !route->lr_downis; + *alive = lnet_is_route_alive(route); lnet_net_unlock(cpt); return 0; }