X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Fapi-ni.c;h=3eb2ee7c665baebba38b906a3a2bf13c3471da58;hp=1a2294fe4b7679cf03c5e65418e323501f1c5d6b;hb=ffd8e881bb98bf3fce0716b46cc51b1922642f6e;hpb=9104b6b5bde4be73c7ce19df29becdec76da36de diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c index 1a2294f..3eb2ee7 100644 --- a/lnet/lnet/api-ni.c +++ b/lnet/lnet/api-ni.c @@ -1086,7 +1086,7 @@ lnet_shutdown_lndnis (void) /* Clear the peer table and wait for all peers to go (they hold refs on * their NIs) */ - lnet_peer_tables_cleanup(); + lnet_peer_tables_cleanup(NULL); lnet_net_lock(LNET_LOCK_EX); /* Now wait for the NI's I just nuked to show up on ln_zombie_nis @@ -1142,12 +1142,6 @@ lnet_shutdown_lndnis (void) the_lnet.ln_shutdown = 0; lnet_net_unlock(LNET_LOCK_EX); - - if (the_lnet.ln_network_tokens != NULL) { - LIBCFS_FREE(the_lnet.ln_network_tokens, - the_lnet.ln_network_tokens_nob); - the_lnet.ln_network_tokens = NULL; - } } int @@ -1168,9 +1162,9 @@ lnet_startup_lndnis (void) if (nets == NULL) goto failed; - rc = lnet_parse_networks(&nilist, nets); - if (rc != 0) - goto failed; + rc = lnet_parse_networks(&nilist, nets); + if (rc != 0) + goto failed; while (!list_empty(&nilist)) { ni = list_entry(nilist.next, lnet_ni_t, ni_list);