LU-11299 lnet: Cleanup rcd

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

diff --git a/lnet/lnet/router_proc.c b/lnet/lnet/router_proc.c
index aaa12cc..5627e40 100644 (file)
--- a/lnet/lnet/router_proc.c
+++ b/lnet/lnet/router_proc.c
@@ -224,18 +224,18 @@ proc_lnet_routes(struct ctl_table *table, int write, void __user *buffer,
                }
 
                if (route != NULL) {
-                       __u32        net        = rnet->lrn_net;
-                       __u32 hops              = route->lr_hops;
-                       unsigned int priority   = route->lr_priority;
-                       lnet_nid_t   nid        = route->lr_gateway->lp_primary_nid;
-                       int          alive      = lnet_is_route_alive(route);
+                       __u32 net = rnet->lrn_net;
+                       __u32 hops = route->lr_hops;
+                       unsigned int priority = route->lr_priority;
+                       int alive = lnet_is_route_alive(route);
 
                        s += snprintf(s, tmpstr + tmpsiz - s,
                                      "%-8s %4d %8u %7s %s\n",
                                      libcfs_net2str(net), hops,
                                      priority,
                                      alive ? "up" : "down",
-                                     libcfs_nid2str(nid));
+                                     /* TODO: replace with actual nid */
+                                     libcfs_nid2str(LNET_NID_ANY));
                        LASSERT(tmpstr + tmpsiz - s > 0);
                }
 
@@ -291,10 +291,8 @@ proc_lnet_routers(struct ctl_table *table, int write, void __user *buffer,
 
        if (*ppos == 0) {
                s += snprintf(s, tmpstr + tmpsiz - s,
-                             "%-4s %7s %9s %6s %12s %9s %8s %7s %s\n",
-                             "ref", "rtr_ref", "alive_cnt", "state",
-                             "last_ping", "ping_sent", "deadline",
-                             "down_ni", "router");
+                             "%-4s %7s %5s %s\n",
+                             "ref", "rtr_ref", "alive", "router");
                LASSERT(tmpstr + tmpsiz - s > 0);
 
                lnet_net_lock(0);
@@ -333,47 +331,15 @@ proc_lnet_routers(struct ctl_table *table, int write, void __user *buffer,
 
                if (peer != NULL) {
                        lnet_nid_t nid = peer->lp_primary_nid;
-                       time64_t now = ktime_get_seconds();
-                       /* TODO: readjust what's being printed */
-                       time64_t deadline = 0;
                        int nrefs     = atomic_read(&peer->lp_refcount);
                        int nrtrrefs  = peer->lp_rtr_refcount;
-                       int alive_cnt = 0;
                        int alive     = lnet_is_gateway_alive(peer);
-                       int pingsent  = ((peer->lp_state & LNET_PEER_PING_SENT)
-                                        != 0);
-                       time64_t last_ping = now - peer->lp_rtrcheck_timestamp;
-                       int down_ni   = 0;
-                       struct lnet_route *rtr;
-
-                       if (nrtrrefs > 0) {
-                               list_for_each_entry(rtr, &peer->lp_routes,
-                                                   lr_gwlist) {
-                                       /* downis on any route should be the
-                                        * number of downis on the gateway */
-                                       if (rtr->lr_downis != 0) {
-                                               down_ni = rtr->lr_downis;
-                                               break;
-                                       }
-                               }
-                       }
 
-                       if (deadline == 0)
-                               s += snprintf(s, tmpstr + tmpsiz - s,
-                                             "%-4d %7d %9d %6s %12llu %9d %8s %7d %s\n",
-                                             nrefs, nrtrrefs, alive_cnt,
-                                             alive ? "up" : "down", last_ping,
-                                             pingsent, "NA", down_ni,
-                                             libcfs_nid2str(nid));
-                       else
-                               s += snprintf(s, tmpstr + tmpsiz - s,
-                                             "%-4d %7d %9d %6s %12llu %9d %8llu %7d %s\n",
-                                             nrefs, nrtrrefs, alive_cnt,
-                                             alive ? "up" : "down", last_ping,
-                                             pingsent,
-                                             deadline - now,
-                                             down_ni, libcfs_nid2str(nid));
-                       LASSERT(tmpstr + tmpsiz - s > 0);
+                       s += snprintf(s, tmpstr + tmpsiz - s,
+                                     "%-4d %7d %5s %s\n",
+                                     nrefs, nrtrrefs,
+                                     alive ? "up" : "down",
+                                     libcfs_nid2str(nid));
                }
 
                lnet_net_unlock(0);
@@ -539,19 +505,6 @@ proc_lnet_peers(struct ctl_table *table, int write, void __user *buffer,
                                aliveness = lnet_is_peer_ni_alive(peer) ?
                                        "up" : "down";
 
-                       if (lnet_peer_aliveness_enabled(peer)) {
-                               time64_t now = ktime_get_seconds();
-
-                               lastalive = now - peer->lpni_last_alive;
-
-                               /* No need to mess up peers contents with
-                                * arbitrarily long integers - it suffices to
-                                * know that lastalive is more than 10000s old
-                                */
-                               if (lastalive >= 10000)
-                                       lastalive = 9999;
-                       }
-
                        lnet_net_unlock(cpt);
 
                        s += snprintf(s, tmpstr + tmpsiz - s,