LU-2800 autoconf: clean up sysctl table handling

[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..f913e40 100644 (file)
--- a/lnet/lnet/router_proc.c
+++ b/lnet/lnet/router_proc.c
@@ -30,29 +30,7 @@
 /* This is really lnet_proc.c. You might need to update sanity test 215
  * if any file format is changed. */
 
-static cfs_sysctl_table_header_t *lnet_table_header = NULL;
-
-#ifndef HAVE_SYSCTL_UNNUMBERED
-#define CTL_LNET         (0x100)
-enum {
-        PSDEV_LNET_STATS = 100,
-        PSDEV_LNET_ROUTES,
-        PSDEV_LNET_ROUTERS,
-        PSDEV_LNET_PEERS,
-        PSDEV_LNET_BUFFERS,
-        PSDEV_LNET_NIS,
-       PSDEV_LNET_PTL_ROTOR,
-};
-#else
-#define CTL_LNET           CTL_UNNUMBERED
-#define PSDEV_LNET_STATS   CTL_UNNUMBERED
-#define PSDEV_LNET_ROUTES  CTL_UNNUMBERED
-#define PSDEV_LNET_ROUTERS CTL_UNNUMBERED
-#define PSDEV_LNET_PEERS   CTL_UNNUMBERED
-#define PSDEV_LNET_BUFFERS CTL_UNNUMBERED
-#define PSDEV_LNET_NIS     CTL_UNNUMBERED
-#define PSDEV_LNET_PTL_ROTOR   CTL_UNNUMBERED
-#endif
+static struct ctl_table_header *lnet_table_header = NULL;
 
 #define LNET_LOFFT_BITS                (sizeof(loff_t) * 8)
 /*
@@ -162,8 +140,6 @@ int LL_PROC_PROTO(proc_lnet_routes)
        int             ver;
        int             off;
 
-       DECLARE_LL_PROC_PPOS_DECL;
-
        CLASSERT(sizeof(loff_t) >= 4);
 
        off = LNET_PROC_HOFF_GET(*ppos);
@@ -185,8 +161,8 @@ int LL_PROC_PROTO(proc_lnet_routes)
                               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);
@@ -240,14 +216,16 @@ int LL_PROC_PROTO(proc_lnet_routes)
                }
 
                 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      = lnet_is_route_alive(route);
 
                        s += snprintf(s, tmpstr + tmpsiz - s,
-                                     "%-8s %4u %7s %s\n",
+                                     "%-8s %4u %8u %7s %s\n",
                                      libcfs_net2str(net), hops,
+                                     priority,
                                      alive ? "up" : "down",
                                      libcfs_nid2str(nid));
                        LASSERT(tmpstr + tmpsiz - s > 0);
@@ -287,8 +265,6 @@ int LL_PROC_PROTO(proc_lnet_routers)
         int        ver;
        int        off;
 
-       DECLARE_LL_PROC_PPOS_DECL;
-
        off = LNET_PROC_HOFF_GET(*ppos);
        ver = LNET_PROC_VER_GET(*ppos);
 
@@ -647,8 +623,6 @@ int LL_PROC_PROTO(proc_lnet_nis)
         char      *s;
         int        len;
 
-        DECLARE_LL_PROC_PPOS_DECL;
-
         LASSERT (!write);
 
         if (*lenp == 0)
@@ -860,78 +834,74 @@ out:
 }
 DECLARE_PROC_HANDLER(proc_lnet_portal_rotor);
 
-static cfs_sysctl_table_t lnet_table[] = {
-        /*
-         * NB No .strategy entries have been provided since sysctl(8) prefers
-         * to go via /proc for portability.
-         */
-        {
-                INIT_CTL_NAME(PSDEV_LNET_STATS)
-                .procname = "stats",
-                .mode     = 0644,
-                .proc_handler = &proc_lnet_stats,
-        },
-        {
-                INIT_CTL_NAME(PSDEV_LNET_ROUTES)
-                .procname = "routes",
-                .mode     = 0444,
-                .proc_handler = &proc_lnet_routes,
-        },
-        {
-                INIT_CTL_NAME(PSDEV_LNET_ROUTERS)
-                .procname = "routers",
-                .mode     = 0444,
-                .proc_handler = &proc_lnet_routers,
-        },
-        {
-                INIT_CTL_NAME(PSDEV_LNET_PEERS)
-                .procname = "peers",
-                .mode     = 0444,
-                .proc_handler = &proc_lnet_peers,
-        },
-        {
-                INIT_CTL_NAME(PSDEV_LNET_PEERS)
-                .procname = "buffers",
-                .mode     = 0444,
-                .proc_handler = &proc_lnet_buffers,
-        },
-        {
-                INIT_CTL_NAME(PSDEV_LNET_NIS)
-                .procname = "nis",
-                .mode     = 0444,
-                .proc_handler = &proc_lnet_nis,
-        },
-        {
-               INIT_CTL_NAME(PSDEV_LNET_PTL_ROTOR)
-               .procname = "portal_rotor",
-               .mode     = 0644,
-               .proc_handler = &proc_lnet_portal_rotor,
+static struct ctl_table lnet_table[] = {
+       /*
+        * NB No .strategy entries have been provided since sysctl(8) prefers
+        * to go via /proc for portability.
+        */
+       {
+               INIT_CTL_NAME
+               .procname       = "stats",
+               .mode           = 0644,
+               .proc_handler   = &proc_lnet_stats,
        },
        {
-               INIT_CTL_NAME(0)
-       }
+               INIT_CTL_NAME
+               .procname       = "routes",
+               .mode           = 0444,
+               .proc_handler   = &proc_lnet_routes,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "routers",
+               .mode           = 0444,
+               .proc_handler   = &proc_lnet_routers,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "peers",
+               .mode           = 0444,
+               .proc_handler   = &proc_lnet_peers,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "buffers",
+               .mode           = 0444,
+               .proc_handler   = &proc_lnet_buffers,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "nis",
+               .mode           = 0444,
+               .proc_handler   = &proc_lnet_nis,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "portal_rotor",
+               .mode           = 0644,
+               .proc_handler   = &proc_lnet_portal_rotor,
+       },
+       { 0 }
 };
 
-static cfs_sysctl_table_t top_table[] = {
-        {
-                INIT_CTL_NAME(CTL_LNET)
-                .procname = "lnet",
-                .mode     = 0555,
-                .data     = NULL,
-                .maxlen   = 0,
-                .child    = lnet_table,
-        },
-        {
-                INIT_CTL_NAME(0)
-        }
+static struct ctl_table top_table[] = {
+       {
+               INIT_CTL_NAME
+               .procname       = "lnet",
+               .mode           = 0555,
+               .data           = NULL,
+               .maxlen         = 0,
+               .child          = lnet_table,
+       },
+       { 0 }
 };
 
 void
 lnet_proc_init(void)
 {
 #ifdef CONFIG_SYSCTL
-        if (lnet_table_header == NULL)
-                lnet_table_header = cfs_register_sysctl_table(top_table, 0);
+       if (lnet_table_header == NULL)
+               lnet_table_header = register_sysctl_table(top_table);
 #endif
 }
 
@@ -939,10 +909,10 @@ void
 lnet_proc_fini(void)
 {
 #ifdef CONFIG_SYSCTL
-        if (lnet_table_header != NULL)
-                cfs_unregister_sysctl_table(lnet_table_header);
+       if (lnet_table_header != NULL)
+               unregister_sysctl_table(lnet_table_header);
 
-        lnet_table_header = NULL;
+       lnet_table_header = NULL;
 #endif
 }