LU-2934 lnet: Add LNet Router Priority parameter

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

diff --git a/lnet/lnet/router_proc.c b/lnet/lnet/router_proc.c
index d4382b0..6bb052b 100644 (file)
--- a/lnet/lnet/router_proc.c
+++ b/lnet/lnet/router_proc.c
@@ -185,8 +185,8 @@ int LL_PROC_PROTO(proc_lnet_routes)
                               the_lnet.ln_routing ? "enabled" : "disabled");
                 LASSERT (tmpstr + tmpsiz - s > 0);
 
                               the_lnet.ln_routing ? "enabled" : "disabled");
                 LASSERT (tmpstr + tmpsiz - s > 0);
 

-                s += snprintf(s, tmpstr + tmpsiz - s, "%-8s %4s %7s %s\n",
-                              "net", "hops", "state", "router");
+               s += snprintf(s, tmpstr + tmpsiz - s, "%-8s %4s %8s %7s %s\n",
+                             "net", "hops", "priority", "state", "router");

                 LASSERT (tmpstr + tmpsiz - s > 0);
 
                lnet_net_lock(0);
                 LASSERT (tmpstr + tmpsiz - s > 0);
 
                lnet_net_lock(0);


@@ -240,14 +240,16 @@ int LL_PROC_PROTO(proc_lnet_routes)
                }
 
                 if (route != NULL) {
                }
 
                 if (route != NULL) {

-                        __u32        net   = rnet->lrn_net;
-                        unsigned int hops  = route->lr_hops;
-                        lnet_nid_t   nid   = route->lr_gateway->lp_nid;
-                        int          alive = route->lr_gateway->lp_alive;
+                       __u32        net        = rnet->lrn_net;
+                       unsigned int hops       = route->lr_hops;
+                       unsigned int priority   = route->lr_priority;
+                       lnet_nid_t   nid        = route->lr_gateway->lp_nid;
+                       int          alive      = route->lr_gateway->lp_alive;

 
                        s += snprintf(s, tmpstr + tmpsiz - s,
 
                        s += snprintf(s, tmpstr + tmpsiz - s,

-                                     "%-8s %4u %7s %s\n",
+                                     "%-8s %4u %8u %7s %s\n",

                                      libcfs_net2str(net), hops,
                                      libcfs_net2str(net), hops,

+                                     priority,

                                      alive ? "up" : "down",
                                      libcfs_nid2str(nid));
                        LASSERT(tmpstr + tmpsiz - s > 0);
                                      alive ? "up" : "down",
                                      libcfs_nid2str(nid));
                        LASSERT(tmpstr + tmpsiz - s > 0);