diff options
| author | James Simmons <jsimmons@infradead.org> | 2017-02-26 19:41:41 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-06 09:17:04 +0100 |
| commit | e3d2716c6f70b8142becd109cb07708d1bca0626 (patch) | |
| tree | 55a02e263f61c903b0696a90ddd2a249c1fee7ca /drivers/staging/lustre/lnet/lnet/router.c | |
| parent | 5716397ac2bba4a9e60ed8bb80926a7322e73565 (diff) | |
| download | linux-0-day-e3d2716c6f70b8142becd109cb07708d1bca0626.tar.gz linux-0-day-e3d2716c6f70b8142becd109cb07708d1bca0626.tar.xz | |
staging: lustre: lnet: change lnet_route_t to proper structure
Change lnet_route_t from typedef to proper structure.
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/20831
Reviewed-by: Olaf Weber <olaf@sgi.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lnet/lnet/router.c')
| -rw-r--r-- | drivers/staging/lustre/lnet/lnet/router.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c index eda829af509f6..8e5af05d7a178 100644 --- a/drivers/staging/lustre/lnet/lnet/router.c +++ b/drivers/staging/lustre/lnet/lnet/router.c @@ -268,7 +268,7 @@ static void lnet_shuffle_seed(void) /* NB expects LNET_LOCK held */ static void -lnet_add_route_to_rnet(lnet_remotenet_t *rnet, lnet_route_t *route) +lnet_add_route_to_rnet(lnet_remotenet_t *rnet, struct lnet_route *route) { unsigned int len = 0; unsigned int offset = 0; @@ -301,7 +301,7 @@ lnet_add_route(__u32 net, __u32 hops, lnet_nid_t gateway, struct list_head *e; lnet_remotenet_t *rnet; lnet_remotenet_t *rnet2; - lnet_route_t *route; + struct lnet_route *route; struct lnet_ni *ni; int add_route; int rc; @@ -368,8 +368,9 @@ lnet_add_route(__u32 net, __u32 hops, lnet_nid_t gateway, /* Search for a duplicate route (it's a NOOP if it is) */ add_route = 1; list_for_each(e, &rnet2->lrn_routes) { - lnet_route_t *route2 = list_entry(e, lnet_route_t, lr_list); + struct lnet_route *route2; + route2 = list_entry(e, struct lnet_route, lr_list); if (route2->lr_gateway == route->lr_gateway) { add_route = 0; break; @@ -416,8 +417,8 @@ int lnet_check_routes(void) { lnet_remotenet_t *rnet; - lnet_route_t *route; - lnet_route_t *route2; + struct lnet_route *route; + struct lnet_route *route2; struct list_head *e1; struct list_head *e2; int cpt; @@ -437,7 +438,7 @@ lnet_check_routes(void) lnet_nid_t nid2; int net; - route = list_entry(e2, lnet_route_t, lr_list); + route = list_entry(e2, struct lnet_route, lr_list); if (!route2) { route2 = route; @@ -472,7 +473,7 @@ lnet_del_route(__u32 net, lnet_nid_t gw_nid) { struct lnet_peer *gateway; lnet_remotenet_t *rnet; - lnet_route_t *route; + struct lnet_route *route; struct list_head *e1; struct list_head *e2; int rc = -ENOENT; @@ -501,7 +502,7 @@ lnet_del_route(__u32 net, lnet_nid_t gw_nid) continue; list_for_each(e2, &rnet->lrn_routes) { - route = list_entry(e2, lnet_route_t, lr_list); + route = list_entry(e2, struct lnet_route, lr_list); gateway = route->lr_gateway; if (!(gw_nid == LNET_NID_ANY || @@ -588,7 +589,7 @@ lnet_get_route(int idx, __u32 *net, __u32 *hops, struct list_head *e1; struct list_head *e2; lnet_remotenet_t *rnet; - lnet_route_t *route; + struct lnet_route *route; int cpt; int i; struct list_head *rn_list; @@ -601,7 +602,8 @@ lnet_get_route(int idx, __u32 *net, __u32 *hops, rnet = list_entry(e1, lnet_remotenet_t, lrn_list); list_for_each(e2, &rnet->lrn_routes) { - route = list_entry(e2, lnet_route_t, lr_list); + route = list_entry(e2, struct lnet_route, + lr_list); if (!idx--) { *net = rnet->lrn_net; @@ -646,7 +648,7 @@ lnet_parse_rc_info(struct lnet_rc_data *rcd) { struct lnet_ping_info *info = rcd->rcd_pinginfo; struct lnet_peer *gw = rcd->rcd_gateway; - lnet_route_t *rte; + struct lnet_route *rte; if (!gw->lp_alive) return; @@ -823,7 +825,7 @@ lnet_wait_known_routerstate(void) void lnet_router_ni_update_locked(struct lnet_peer *gw, __u32 net) { - lnet_route_t *rte; + struct lnet_route *rte; if ((gw->lp_ping_feats & LNET_PING_FEAT_NI_STATUS)) { list_for_each_entry(rte, &gw->lp_routes, lr_gwlist) { |