LU-6978 utils: mkfs.lustre to recognise non ldiskfs opts

[fs/lustre-release.git] / lnet / lnet / peer.c

diff --git a/lnet/lnet/peer.c b/lnet/lnet/peer.c
index 363d270..1f2f1fa 100644 (file)
--- a/lnet/lnet/peer.c
+++ b/lnet/lnet/peer.c
@@ -138,7 +138,8 @@ lnet_peer_table_deathrow_wait_locked(struct lnet_peer_table *ptable,
                               "Waiting for %d zombies on peer table\n",
                               ptable->pt_zombies);
                }
-               cfs_pause(cfs_time_seconds(1) >> 1);
+               set_current_state(TASK_UNINTERRUPTIBLE);
+               schedule_timeout(cfs_time_seconds(1) >> 1);
                lnet_net_lock(cpt_locked);
        }
 }
@@ -375,7 +376,7 @@ lnet_debug_peer(lnet_nid_t nid)
                 return;
         }
 
-       if (lnet_peer_aliveness_enabled(lp))
+        if (lnet_isrouter(lp) || lnet_peer_aliveness_enabled(lp))
                 aliveness = lp->lp_alive ? "up" : "down";
 
         CDEBUG(D_WARNING, "%-24s %4d %5s %5d %5d %5d %5d %5d %ld\n",
@@ -427,7 +428,8 @@ int lnet_get_peer_info(__u32 peer_index, __u64 *nid,
                                continue;
 
                        snprintf(aliveness, LNET_MAX_STR_LEN, "NA");
-                       if (lnet_peer_aliveness_enabled(lp))
+                       if (lnet_isrouter(lp) ||
+                               lnet_peer_aliveness_enabled(lp))
                                snprintf(aliveness, LNET_MAX_STR_LEN,
                                         lp->lp_alive ? "up" : "down");