if (lp) {
route = list_first_entry(l, struct lnet_route,
- lr_list);
+ lr_list);
route->lr_gateway = lp;
lnet_add_route_to_rnet(rnet, route);
} else {
while (!list_empty(l) && !rt_list) {
route = list_first_entry(l, struct lnet_route,
- lr_list);
+ lr_list);
list_del(&route->lr_list);
LIBCFS_FREE(route, sizeof(*route));
}
lnet_check_route_inconsistency(struct lnet_route *route)
{
if (!route->lr_single_hop &&
- (route->lr_hops == 1 || route->lr_hops == LNET_UNDEFINED_HOPS)) {
+ (route->lr_hops == 1 || route->lr_hops == LNET_UNDEFINED_HOPS) &&
+ avoid_asym_router_failure) {
CWARN("route %s->%s is detected to be multi-hop but hop count is set to %d\n",
libcfs_net2str(route->lr_net),
libcfs_nidstr(&route->lr_gateway->lp_primary_nid),
lnet_find_rnet_locked(__u32 net)
{
struct lnet_remotenet *rnet;
- struct list_head *tmp;
struct list_head *rn_list;
LASSERT(the_lnet.ln_state == LNET_STATE_RUNNING);
rn_list = lnet_net2rnethash(net);
- list_for_each(tmp, rn_list) {
- rnet = list_entry(tmp, struct lnet_remotenet, lrn_list);
-
+ list_for_each_entry(rnet, rn_list, lrn_list) {
if (rnet->lrn_net == net)
return rnet;
}
struct lnet_remotenet *rnet;
struct list_head *rn_list;
struct lnet_route *route;
- struct list_head *e1;
- struct list_head *e2;
int cpt;
int i;
for (i = 0; i < LNET_REMOTE_NETS_HASH_SIZE; i++) {
rn_list = &the_lnet.ln_remote_nets_hash[i];
- list_for_each(e1, rn_list) {
- rnet = list_entry(e1, struct lnet_remotenet, lrn_list);
-
- list_for_each(e2, &rnet->lrn_routes) {
- route = list_entry(e2, struct lnet_route,
- lr_list);
-
+ list_for_each_entry(rnet, rn_list, lrn_list) {
+ list_for_each_entry(route, &rnet->lrn_routes, lr_list) {
if (idx-- == 0) {
*net = rnet->lrn_net;
*gateway = lnet_nid_to_nid4(&route->lr_nid);
lnet_wait_known_routerstate(void)
{
struct lnet_peer *rtr;
- struct list_head *entry;
int all_known;
LASSERT(the_lnet.ln_mt_state == LNET_MT_STATE_RUNNING);
int cpt = lnet_net_lock_current();
all_known = 1;
- list_for_each(entry, &the_lnet.ln_routers) {
- rtr = list_entry(entry, struct lnet_peer,
- lp_rtr_list);
-
+ list_for_each_entry(rtr, &the_lnet.ln_routers, lp_rtr_list) {
spin_lock(&rtr->lp_lock);
if ((rtr->lp_state & LNET_PEER_RTR_DISCOVERED) == 0) {
struct lnet_peer_net *first_lpn;
struct lnet_peer_net *lpn;
struct lnet_peer_ni *lpni;
- struct list_head *entry;
struct lnet_peer *rtr;
bool push = false;
bool needs_ping;
rescan:
version = the_lnet.ln_routers_version;
- list_for_each(entry, &the_lnet.ln_routers) {
- rtr = list_entry(entry, struct lnet_peer,
- lp_rtr_list);
-
+ list_for_each_entry(rtr, &the_lnet.ln_routers, lp_rtr_list) {
/* If we're currently discovering the peer then don't
* issue another discovery
*/
/* Free buffers on the free list. */
while (!list_empty(&tmp)) {
- rb = list_entry(tmp.next, struct lnet_rtrbuf, rb_list);
+ rb = list_first_entry(&tmp, struct lnet_rtrbuf, rb_list);
list_del(&rb->rb_list);
lnet_destroy_rtrbuf(rb, npages);
}
return 0;
failed:
- while (!list_empty(&rb_list)) {
- rb = list_entry(rb_list.next, struct lnet_rtrbuf, rb_list);
+ while ((rb = list_first_entry_or_null(&rb_list,
+ struct lnet_rtrbuf,
+ rb_list)) != NULL) {
list_del(&rb->rb_list);
lnet_destroy_rtrbuf(rb, npages);
}