Whamcloud - gitweb
LU-2800 autoconf: clean up sysctl table handling 02/8102/2
authorJames Simmons <uja.ornl@gmail.com>
Wed, 30 Oct 2013 12:26:33 +0000 (08:26 -0400)
committerOleg Drokin <oleg.drokin@intel.com>
Mon, 2 Dec 2013 12:55:27 +0000 (12:55 +0000)
Before linux kernel version 2.6.24 came out lustre
like other subsystems registering with sysctl had
to assign unquie numbers for ctl_name in struct
ctl_table. After 2.6.24 this requirement changed
and lustre started to use CTL_UNNUMBERED as the
default value. Since we no longer support 2.6.24
and earlier kernels we can remove this test and
simply the code. We also simplifed the handling
of the strategy field in struct ctl_table. The
final fix is that several LND drivers never handled
that case of 2.6.33 and above kernels which removed
the ctl_name and strategy fields altogether. This
patch addresses this so LND drivers can be handled
better on distros using newer kernels.

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Change-Id: I0f5b64552e7d54abf4b73bfe285109573725edaf
Reviewed-on: http://review.whamcloud.com/8102
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
20 files changed:
libcfs/autoconf/lustre-libcfs.m4
libcfs/include/libcfs/linux/kp30.h
libcfs/libcfs/linux/linux-proc.c
lnet/include/lnet/Makefile.am
lnet/include/lnet/lnet-sysctl.h [deleted file]
lnet/klnds/gnilnd/gnilnd.h
lnet/klnds/gnilnd/gnilnd_modparams.c
lnet/klnds/gnilnd/gnilnd_sysctl.c
lnet/klnds/mxlnd/mxlnd.h
lnet/klnds/mxlnd/mxlnd_modparams.c
lnet/klnds/o2iblnd/o2iblnd.h
lnet/klnds/o2iblnd/o2iblnd_modparams.c
lnet/klnds/qswlnd/qswlnd.h
lnet/klnds/qswlnd/qswlnd_modparams.c
lnet/klnds/ralnd/ralnd.h
lnet/klnds/ralnd/ralnd_modparams.c
lnet/klnds/socklnd/socklnd.h
lnet/klnds/socklnd/socklnd_lib-linux.c
lnet/lnet/router_proc.c
lustre/obdclass/linux/linux-sysctl.c

index 09a9bdd..2857e17 100644 (file)
@@ -82,24 +82,6 @@ LB_LINUX_TRY_COMPILE([
 EXTRA_KCFLAGS="$tmp_flags"
 ])
 
-# 2.6.24 request not use real numbers for ctl_name
-AC_DEFUN([LIBCFS_SYSCTL_UNNUMBERED],
-[AC_MSG_CHECKING([for CTL_UNNUMBERED])
-LB_LINUX_TRY_COMPILE([
-        #include <linux/sysctl.h>
-],[
-       #ifndef CTL_UNNUMBERED
-       #error CTL_UNNUMBERED not exist in kernel
-       #endif
-],[
-        AC_MSG_RESULT(yes)
-        AC_DEFINE(HAVE_SYSCTL_UNNUMBERED, 1,
-                  [sysctl has CTL_UNNUMBERED])
-],[
-        AC_MSG_RESULT(NO)
-])
-])
-
 #
 # LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK
 #
@@ -318,8 +300,6 @@ AC_DEFUN([LIBCFS_PROG_LINUX],
 LIBCFS_CONFIG_PANIC_DUMPLOG
 
 LIBCFS_U64_LONG_LONG_LINUX
-# 2.6.24
-LIBCFS_SYSCTL_UNNUMBERED
 # 2.6.32
 LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK
 LC_SHRINKER_WANT_SHRINK_PTR
index 274c599..7989619 100644 (file)
@@ -269,11 +269,11 @@ extern int  lwt_snapshot (cfs_cycles_t *now, int *ncpu, int *total_size,
 #undef _LWORDSIZE
 
 #ifdef HAVE_SYSCTL_CTLNAME
-#define INIT_CTL_NAME(a) .ctl_name = a,
-#define INIT_STRATEGY(a) .strategy = a,
+#define INIT_CTL_NAME  .ctl_name = CTL_UNNUMBERED,
+#define INIT_STRATEGY  .strategy = &sysctl_intvec,
 #else
-#define INIT_CTL_NAME(a)
-#define INIT_STRATEGY(a)
+#define INIT_CTL_NAME
+#define INIT_STRATEGY
 #endif
 
 #endif
index dc11f1e..822bd1c 100644 (file)
@@ -76,58 +76,6 @@ extern char lnet_upcall[1024];
  */
 extern char lnet_debug_log_upcall[1024];
 
-#ifndef HAVE_SYSCTL_UNNUMBERED
-#define CTL_LNET        (0x100)
-enum {
-        PSDEV_DEBUG = 1,          /* control debugging */
-        PSDEV_SUBSYSTEM_DEBUG,    /* control debugging */
-        PSDEV_PRINTK,             /* force all messages to console */
-        PSDEV_CONSOLE_RATELIMIT,  /* ratelimit console messages */
-        PSDEV_CONSOLE_MAX_DELAY_CS, /* maximum delay over which we skip messages */
-        PSDEV_CONSOLE_MIN_DELAY_CS, /* initial delay over which we skip messages */
-        PSDEV_CONSOLE_BACKOFF,    /* delay increase factor */
-        PSDEV_DEBUG_PATH,         /* crashdump log location */
-        PSDEV_DEBUG_DUMP_PATH,    /* crashdump tracelog location */
-       PSDEV_CPT_TABLE,          /* information about cpu partitions */
-        PSDEV_LNET_UPCALL,        /* User mode upcall script  */
-        PSDEV_LNET_MEMUSED,       /* bytes currently PORTAL_ALLOCated */
-        PSDEV_LNET_CATASTROPHE,   /* if we have LBUGged or panic'd */
-        PSDEV_LNET_PANIC_ON_LBUG, /* flag to panic on LBUG */
-        PSDEV_LNET_DUMP_KERNEL,   /* snapshot kernel debug buffer to file */
-        PSDEV_LNET_DAEMON_FILE,   /* spool kernel debug buffer to file */
-        PSDEV_LNET_DEBUG_MB,      /* size of debug buffer */
-        PSDEV_LNET_DEBUG_LOG_UPCALL, /* debug log upcall script */
-        PSDEV_LNET_WATCHDOG_RATELIMIT,  /* ratelimit watchdog messages  */
-        PSDEV_LNET_FORCE_LBUG,    /* hook to force an LBUG */
-        PSDEV_LNET_FAIL_LOC,      /* control test failures instrumentation */
-        PSDEV_LNET_FAIL_VAL,      /* userdata for fail loc */
-};
-#else
-#define CTL_LNET                        CTL_UNNUMBERED
-#define PSDEV_DEBUG                     CTL_UNNUMBERED
-#define PSDEV_SUBSYSTEM_DEBUG           CTL_UNNUMBERED
-#define PSDEV_PRINTK                    CTL_UNNUMBERED
-#define PSDEV_CONSOLE_RATELIMIT         CTL_UNNUMBERED
-#define PSDEV_CONSOLE_MAX_DELAY_CS      CTL_UNNUMBERED
-#define PSDEV_CONSOLE_MIN_DELAY_CS      CTL_UNNUMBERED
-#define PSDEV_CONSOLE_BACKOFF           CTL_UNNUMBERED
-#define PSDEV_DEBUG_PATH                CTL_UNNUMBERED
-#define PSDEV_DEBUG_DUMP_PATH           CTL_UNNUMBERED
-#define PSDEV_CPT_TABLE                        CTL_UNNUMBERED
-#define PSDEV_LNET_UPCALL               CTL_UNNUMBERED
-#define PSDEV_LNET_MEMUSED              CTL_UNNUMBERED
-#define PSDEV_LNET_CATASTROPHE          CTL_UNNUMBERED
-#define PSDEV_LNET_PANIC_ON_LBUG        CTL_UNNUMBERED
-#define PSDEV_LNET_DUMP_KERNEL          CTL_UNNUMBERED
-#define PSDEV_LNET_DAEMON_FILE          CTL_UNNUMBERED
-#define PSDEV_LNET_DEBUG_MB             CTL_UNNUMBERED
-#define PSDEV_LNET_DEBUG_LOG_UPCALL     CTL_UNNUMBERED
-#define PSDEV_LNET_WATCHDOG_RATELIMIT   CTL_UNNUMBERED
-#define PSDEV_LNET_FORCE_LBUG           CTL_UNNUMBERED
-#define PSDEV_LNET_FAIL_LOC             CTL_UNNUMBERED
-#define PSDEV_LNET_FAIL_VAL             CTL_UNNUMBERED
-#endif
-
 int
 proc_call_handler(void *data, int write,
                   loff_t *ppos, void *buffer, size_t *lenp,
@@ -394,195 +342,189 @@ static int __proc_cpt_table(void *data, int write,
 DECLARE_PROC_HANDLER(proc_cpt_table)
 
 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(PSDEV_DEBUG)
-                .procname = "debug",
-                .data     = &libcfs_debug,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dobitmasks,
-        },
-        {
-                INIT_CTL_NAME(PSDEV_SUBSYSTEM_DEBUG)
-                .procname = "subsystem_debug",
-                .data     = &libcfs_subsystem_debug,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dobitmasks,
-        },
-        {
-                INIT_CTL_NAME(PSDEV_PRINTK)
-                .procname = "printk",
-                .data     = &libcfs_printk,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dobitmasks,
-        },
-        {
-                INIT_CTL_NAME(PSDEV_CONSOLE_RATELIMIT)
-                .procname = "console_ratelimit",
-                .data     = &libcfs_console_ratelimit,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                INIT_CTL_NAME(PSDEV_CONSOLE_MAX_DELAY_CS)
-                .procname = "console_max_delay_centisecs",
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_console_max_delay_cs
-        },
-        {
-                INIT_CTL_NAME(PSDEV_CONSOLE_MIN_DELAY_CS)
-                .procname = "console_min_delay_centisecs",
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_console_min_delay_cs
-        },
-        {
-                INIT_CTL_NAME(PSDEV_CONSOLE_BACKOFF)
-                .procname = "console_backoff",
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_console_backoff
-        },
-
-        {
-                INIT_CTL_NAME(PSDEV_DEBUG_PATH)
-                .procname = "debug_path",
-                .data     = libcfs_debug_file_path_arr,
-                .maxlen   = sizeof(libcfs_debug_file_path_arr),
-                .mode     = 0644,
-                .proc_handler = &proc_dostring,
-        },
-
+       /*
+        * NB No .strategy entries have been provided since sysctl(8) prefers
+        * to go via /proc for portability.
+        */
        {
-               INIT_CTL_NAME(PSDEV_CPT_TABLE)
-               .procname = "cpu_partition_table",
-               .maxlen   = 128,
-               .mode     = 0444,
-               .proc_handler = &proc_cpt_table,
+               INIT_CTL_NAME
+               .procname       = "debug",
+               .data           = &libcfs_debug,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dobitmasks,
        },
-
-        {
-                INIT_CTL_NAME(PSDEV_LNET_UPCALL)
-                .procname = "upcall",
-                .data     = lnet_upcall,
-                .maxlen   = sizeof(lnet_upcall),
-                .mode     = 0644,
-                .proc_handler = &proc_dostring,
-        },
-        {
-                INIT_CTL_NAME(PSDEV_LNET_DEBUG_LOG_UPCALL)
-                .procname = "debug_log_upcall",
-                .data     = lnet_debug_log_upcall,
-                .maxlen   = sizeof(lnet_debug_log_upcall),
-                .mode     = 0644,
-                .proc_handler = &proc_dostring,
-        },
-        {
-                INIT_CTL_NAME(PSDEV_LNET_MEMUSED)
-                .procname = "lnet_memused",
-                .data     = (int *)&libcfs_kmemory.counter,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec,
-                INIT_STRATEGY(&sysctl_intvec)
-        },
-        {
-                INIT_CTL_NAME(PSDEV_LNET_CATASTROPHE)
-                .procname = "catastrophe",
-                .data     = &libcfs_catastrophe,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec,
-                INIT_STRATEGY(&sysctl_intvec)
-        },
-        {
-                INIT_CTL_NAME(PSDEV_LNET_PANIC_ON_LBUG)
-                .procname = "panic_on_lbug",
-                .data     = &libcfs_panic_on_lbug,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                INIT_STRATEGY(&sysctl_intvec)
-        },
-        {
-                INIT_CTL_NAME(PSDEV_LNET_DUMP_KERNEL)
-                .procname = "dump_kernel",
-                .maxlen   = 256,
-                .mode     = 0200,
-                .proc_handler = &proc_dump_kernel,
-        },
-        {
-                INIT_CTL_NAME(PSDEV_LNET_DAEMON_FILE)
-                .procname = "daemon_file",
-                .mode     = 0644,
-                .maxlen   = 256,
-                .proc_handler = &proc_daemon_file,
-        },
-        {
-                INIT_CTL_NAME(PSDEV_LNET_DEBUG_MB)
-                .procname = "debug_mb",
-                .mode     = 0644,
-                .proc_handler = &proc_debug_mb,
-        },
-        {
-                INIT_CTL_NAME(PSDEV_LNET_WATCHDOG_RATELIMIT)
-                .procname = "watchdog_ratelimit",
-                .data     = &libcfs_watchdog_ratelimit,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec_minmax,
-                .extra1   = &min_watchdog_ratelimit,
-                .extra2   = &max_watchdog_ratelimit,
-        },
-        {       INIT_CTL_NAME(PSDEV_LNET_FORCE_LBUG)
-                .procname = "force_lbug",
-                .data     = NULL,
-                .maxlen   = 0,
-                .mode     = 0200,
-                .proc_handler = &libcfs_force_lbug
-        },
-        {
-                INIT_CTL_NAME(PSDEV_LNET_FAIL_LOC)
-                .procname = "fail_loc",
-                .data     = &cfs_fail_loc,
-                .maxlen   = sizeof(cfs_fail_loc),
-                .mode     = 0644,
-                .proc_handler = &proc_fail_loc
-        },
-        {
-                INIT_CTL_NAME(PSDEV_LNET_FAIL_VAL)
-                .procname = "fail_val",
-                .data     = &cfs_fail_val,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                INIT_CTL_NAME(0)
-        }
+       {
+               INIT_CTL_NAME
+               .procname       = "subsystem_debug",
+               .data           = &libcfs_subsystem_debug,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dobitmasks,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "printk",
+               .data           = &libcfs_printk,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dobitmasks,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "console_ratelimit",
+               .data           = &libcfs_console_ratelimit,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "console_max_delay_centisecs",
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_console_max_delay_cs
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "console_min_delay_centisecs",
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_console_min_delay_cs
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "console_backoff",
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_console_backoff
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "debug_path",
+               .data           = libcfs_debug_file_path_arr,
+               .maxlen         = sizeof(libcfs_debug_file_path_arr),
+               .mode           = 0644,
+               .proc_handler   = &proc_dostring,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "cpu_partition_table",
+               .maxlen         = 128,
+               .mode           = 0444,
+               .proc_handler   = &proc_cpt_table,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "upcall",
+               .data           = lnet_upcall,
+               .maxlen         = sizeof(lnet_upcall),
+               .mode           = 0644,
+               .proc_handler   = &proc_dostring,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "debug_log_upcall",
+               .data           = lnet_debug_log_upcall,
+               .maxlen         = sizeof(lnet_debug_log_upcall),
+               .mode           = 0644,
+               .proc_handler   = &proc_dostring,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "lnet_memused",
+               .data           = (int *)&libcfs_kmemory.counter,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "catastrophe",
+               .data           = &libcfs_catastrophe,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "panic_on_lbug",
+               .data           = &libcfs_panic_on_lbug,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "dump_kernel",
+               .maxlen         = 256,
+               .mode           = 0200,
+               .proc_handler   = &proc_dump_kernel,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "daemon_file",
+               .mode           = 0644,
+               .maxlen         = 256,
+               .proc_handler   = &proc_daemon_file,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "debug_mb",
+               .mode           = 0644,
+               .proc_handler   = &proc_debug_mb,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "watchdog_ratelimit",
+               .data           = &libcfs_watchdog_ratelimit,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec_minmax,
+               .extra1         = &min_watchdog_ratelimit,
+               .extra2         = &max_watchdog_ratelimit,
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "force_lbug",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0200,
+               .proc_handler   = &libcfs_force_lbug
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "fail_loc",
+               .data           = &cfs_fail_loc,
+               .maxlen         = sizeof(cfs_fail_loc),
+               .mode           = 0644,
+               .proc_handler   = &proc_fail_loc
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "fail_val",
+               .data           = &cfs_fail_val,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       { 0 }
 };
 
 #ifdef CONFIG_SYSCTL
 static struct ctl_table top_table[] = {
         {
-                INIT_CTL_NAME(CTL_LNET)
-                .procname = "lnet",
-                .mode     = 0555,
-                .data     = NULL,
-                .maxlen   = 0,
-                .child    = lnet_table,
-        },
-        {
-                INIT_CTL_NAME(0)
-        }
+               INIT_CTL_NAME
+               .procname       = "lnet",
+               .mode           = 0555,
+               .data           = NULL,
+               .maxlen         = 0,
+               .child          = lnet_table,
+       },
+       { 0 }
 };
 #endif
 
index cc28f14..0f4825b 100644 (file)
@@ -8,4 +8,4 @@ DIST_SUBDIRS = linux darwin
 
 EXTRA_DIST = api.h api-support.h \
        lib-lnet.h lib-types.h lnet.h lnetctl.h types.h \
-        socklnd.h ptllnd.h ptllnd_wire.h lnetst.h lnet-sysctl.h
+       socklnd.h ptllnd.h ptllnd_wire.h lnetst.h
diff --git a/lnet/include/lnet/lnet-sysctl.h b/lnet/include/lnet/lnet-sysctl.h
deleted file mode 100644 (file)
index 250ab2d..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * GPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 only,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License version 2 for more details (a copy is included
- * in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- *
- * GPL HEADER END
- */
-/*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- * Use is subject to license terms.
- */
-/*
- * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
- */
-
-#ifndef __LNET_SYSCTL_H__
-#define __LNET_SYSCTL_H__
-
-#if defined(CONFIG_SYSCTL)
-
-#ifndef HAVE_SYSCTL_UNNUMBERED
-
-#define CTL_KRANAL      201
-#define CTL_O2IBLND     205
-#define CTL_PTLLND      206
-#define CTL_QSWNAL      207
-#define CTL_SOCKLND     208
-#define CTL_GNILND      210
-
-#else
-
-#define CTL_KRANAL      CTL_UNNUMBERED
-#define CTL_O2IBLND     CTL_UNNUMBERED
-#define CTL_PTLLND      CTL_UNNUMBERED
-#define CTL_QSWNAL     CTL_UNNUMBERED
-#define CTL_SOCKLND     CTL_UNNUMBERED
-#define CTL_GNILND      CTL_UNNUMBERED
-
-#endif /* sysctl id */
-
-#endif
-
-#endif
index 064492a..a13af55 100644 (file)
@@ -64,7 +64,6 @@
 #include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-lnet.h>
-#include <lnet/lnet-sysctl.h>
 
 #include <gni_pub.h>
 #include "gnilnd_version.h"
index 6707e58..03184ad 100644 (file)
@@ -203,9 +203,9 @@ kgn_tunables_t kgnilnd_tunables = {
 };
 
 #if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
-static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
+static struct ctl_table kgnilnd_ctl_table[] = {
        {
-               INIT_CTL_NAME(2)
+               INIT_CTL_NAME
                .procname = "min_reconnect_interval",
                .data     = &min_reconnect_interval,
                .maxlen   = sizeof(int),
@@ -213,7 +213,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(3)
+               INIT_CTL_NAME
                .procname = "max_reconnect_interval",
                .data     = &max_reconnect_interval,
                .maxlen   = sizeof(int),
@@ -221,7 +221,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(5)
+               INIT_CTL_NAME
                .procname = "credits",
                .data     = &credits,
                .maxlen   = sizeof(int),
@@ -229,7 +229,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(6)
+               INIT_CTL_NAME
                .procname = "peer_credits",
                .data     = &peer_credits,
                .maxlen   = sizeof(int),
@@ -237,7 +237,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(7)
+               INIT_CTL_NAME
                .procname = "fma_cq_size",
                .data     = &fma_cq_size,
                .maxlen   = sizeof(int),
@@ -245,7 +245,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(8)
+               INIT_CTL_NAME
                .procname = "timeout",
                .data     = &timeout,
                .maxlen   = sizeof(int),
@@ -253,7 +253,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(9)
+               INIT_CTL_NAME
                .procname = "max_immediate",
                .data     = &max_immediate,
                .maxlen   = sizeof(int),
@@ -261,7 +261,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(10)
+               INIT_CTL_NAME
                .procname = "checksum",
                .data     = &checksum,
                .maxlen   = sizeof(int),
@@ -269,7 +269,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(11)
+               INIT_CTL_NAME
                .procname = "bte_dlvr_mode",
                .data     = &bte_dlvr_mode,
                .maxlen   = sizeof(int),
@@ -277,7 +277,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(13)
+               INIT_CTL_NAME
                .procname = "ptag",
                .data     = &ptag,
                .maxlen   = sizeof(int),
@@ -285,7 +285,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(14)
+               INIT_CTL_NAME
                .procname = "nwildcard",
                .data     = &nwildcard,
                .maxlen   = sizeof(int),
@@ -293,7 +293,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(15)
+               INIT_CTL_NAME
                .procname = "bte_relaxed_ordering",
                .data     = &bte_relaxed_ordering,
                .maxlen   = sizeof(int),
@@ -301,7 +301,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(16)
+               INIT_CTL_NAME
                .procname = "checksum_dump",
                .data     = &checksum_dump,
                .maxlen   = sizeof(int),
@@ -309,7 +309,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(17)
+               INIT_CTL_NAME
                .procname = "nice",
                .data     = &nice,
                .maxlen   = sizeof(int),
@@ -317,7 +317,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(18)
+               INIT_CTL_NAME
                .procname = "rdmaq_intervals",
                .data     = &rdmaq_intervals,
                .maxlen   = sizeof(int),
@@ -325,7 +325,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(19)
+               INIT_CTL_NAME
                .procname = "loops",
                .data     = &loops,
                .maxlen   = sizeof(int),
@@ -333,7 +333,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(20)
+               INIT_CTL_NAME
                .procname = "hash_size",
                .data     = &hash_size,
                .maxlen   = sizeof(int),
@@ -341,7 +341,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(21)
+               INIT_CTL_NAME
                .procname = "peer_health",
                .data     = &peer_health,
                .maxlen   = sizeof(int),
@@ -349,7 +349,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(22)
+               INIT_CTL_NAME
                .procname = "vmap_cksum",
                .data     = &vmap_cksum,
                .maxlen   = sizeof(int),
@@ -357,7 +357,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(23)
+               INIT_CTL_NAME
                .procname = "mbox_per_block",
                .data     = &mbox_per_block,
                .maxlen   = sizeof(int),
@@ -365,7 +365,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(24)
+               INIT_CTL_NAME
                .procname = "mbox_credits"
                .data     = &mbox_credits,
                .maxlen   = sizeof(int),
@@ -373,7 +373,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(25)
+               INIT_CTL_NAME
                .procname = "sched_threads"
                .data     = &sched_threads,
                .maxlen   = sizeof(int),
@@ -381,7 +381,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(26)
+               INIT_CTL_NAME
                .procname = "net_hash_size",
                .data     = &net_hash_size,
                .maxlen   = sizeof(int),
@@ -389,7 +389,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(27)
+               INIT_CTL_NAME
                .procname = "hardware_timeout",
                .data     = &hardware_timeout,
                .maxlen   = sizeof(int),
@@ -397,7 +397,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(28)
+               INIT_CTL_NAME
                .procname = "mdd_timeout",
                .data     = &mdd_timeout,
                .maxlen   = sizeof(int),
@@ -405,7 +405,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(29)
+               INIT_CTL_NAME
                .procname = "max_retransmits"
                .data     = &max_retransmits,
                .maxlen   = sizeof(int),
@@ -413,7 +413,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(30)
+               INIT_CTL_NAME
                .procname = "concurrent_sends",
                .data     = &concurrent_sends,
                .maxlen   = sizeof(int),
@@ -421,7 +421,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(31)
+               INIT_CTL_NAME
                .procname = "nphys_mbox",
                .data     = &nphys_mbox,
                .maxlen   = sizeof(int),
@@ -429,7 +429,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(32)
+               INIT_CTL_NAME
                .procname = "sched_timeout",
                .data     = &sched_timeout,
                .maxlen   = sizeof(int),
@@ -437,7 +437,7 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(33)
+               INIT_CTL_NAME
                .procname = "sched_nice",
                .data     = &sched_nice,
                .maxlen   = sizeof(int),
@@ -445,14 +445,14 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(34)
+               INIT_CTL_NAME
                .procname = "reverse_rdma",
                .data     = &reverse_rdma,
                .maxlen   = sizeof(int),
                .mode     = 0644,
                .proc_handler = &proc_dointvec
        },
-               INIT_CTL_NAME(35)
+               INIT_CTL_NAME
                .procname = "dgram_timeout"
                .data     = &dgram_timeout,
                .maxlen   = sizeof(int),
@@ -460,26 +460,26 @@ static cfs_sysctl_table_t kgnilnd_ctl_table[] = {
                .proc_handler = &proc_dointvec
        },
        {
-               INIT_CTL_NAME(36)
+               INIT_CTL_NAME
                .procname = "peer_timeout"
                .data     = &peer_timeout,
                .maxlen   = sizeof(int),
                .mode     = 0444,
                .proc_handler = &proc_dointvec
        },
-       {0}
+       { 0 }
 };
 
-static cfs_sysctl_table_t kgnilnd_top_ctl_table[] = {
+static struct ctl_table kgnilnd_top_ctl_table[] = {
        {
-               INIT_CTL_NAME(202)
+               INIT_CTL_NAME
                .procname = "gnilnd",
                .data     = NULL,
                .maxlen   = 0,
                .mode     = 0555,
                .child    = kgnilnd_ctl_table
        },
-       {       INIT_CTL_NAME(0)   }
+       { 0 }
 };
 #endif
 
index 5d9d742..132560f 100644 (file)
@@ -39,24 +39,6 @@ static kgn_sysctl_data_t        kgnilnd_sysctl;
 #if defined(CONFIG_SYSCTL)
 
 static struct ctl_table_header *kgnilnd_table_header = NULL;
-#ifndef HAVE_SYSCTL_UNNUMBERED
-
-enum {
-       GNILND_VERSION = 1,
-       GNILND_THREAD_PAUSE,
-       GNILND_HW_QUIESCE,
-       GNILND_STACK_RESET,
-       GNILND_RDMAQ_OVERRIDE,
-       GNILND_RCA_INJECT,
-};
-#else
-#define GNILND_VERSION             CTL_UNNUMBERED
-#define GNILND_THREAD_PAUSE        CTL_UNNUMBERED
-#define GNILND_HW_QUIESCE          CTL_UNNUMBERED
-#define GNILND_STACK_RESET         CTL_UNNUMBERED
-#define GNILND_RDMAQ_OVERRIDE      CTL_UNNUMBERED
-#define GNILND_RCA_INJECT          CTL_UNNUMBERED
-#endif
 
 static int LL_PROC_PROTO(proc_toggle_thread_pause)
 {
@@ -239,7 +221,7 @@ static struct ctl_table kgnilnd_table[] = {
         * to go via /proc for portability.
         */
        {
-               INIT_CTL_NAME(GNILND_VERSION)
+               INIT_CTL_NAME
                .procname = "version",
                .data     = KGNILND_BUILD_REV,
                .maxlen   = sizeof(KGNILND_BUILD_REV),
@@ -247,7 +229,7 @@ static struct ctl_table kgnilnd_table[] = {
                .proc_handler = &proc_dostring
        },
        {
-               INIT_CTL_NAME(GNILND_THREAD_PAUSE)
+               INIT_CTL_NAME
                .procname = "thread_pause",
                .data     = &kgnilnd_sysctl.ksd_pause_trigger,
                .maxlen   = sizeof(int),
@@ -255,7 +237,7 @@ static struct ctl_table kgnilnd_table[] = {
                .proc_handler = &proc_toggle_thread_pause,
        },
        {
-               INIT_CTL_NAME(GNILND_HW_QUIESCE)
+               INIT_CTL_NAME
                .procname = "hw_quiesce",
                .data     = &kgnilnd_sysctl.ksd_quiesce_secs,
                .maxlen   = sizeof(__u32),
@@ -263,7 +245,7 @@ static struct ctl_table kgnilnd_table[] = {
                .proc_handler = &proc_hw_quiesce,
        },
        {
-               INIT_CTL_NAME(GNILND_STACK_RESET)
+               INIT_CTL_NAME
                .procname = "stack_reset",
                .data     = NULL,
                .maxlen   = sizeof(int),
@@ -271,7 +253,7 @@ static struct ctl_table kgnilnd_table[] = {
                .proc_handler = &proc_trigger_stack_reset,
        },
        {
-               INIT_CTL_NAME(GNILND_RDMAQ_OVERRIDE)
+               INIT_CTL_NAME
                .procname = "rdmaq_override",
                .data     = &kgnilnd_sysctl.ksd_rdmaq_override,
                .maxlen   = sizeof(int),
@@ -279,26 +261,26 @@ static struct ctl_table kgnilnd_table[] = {
                .proc_handler = &proc_toggle_rdmaq_override,
        },
        {
-               INIT_CTL_NAME(GNILND_RCA_INJECT)
+               INIT_CTL_NAME
                .procname = "rca_inject",
                .data     = kgnilnd_sysctl.ksd_rca_inject,
                .maxlen   = GNILND_RCA_INJ_STRLEN,
                .mode     = 0644,
                .proc_handler = &proc_rca_inject,
        },
-       {       INIT_CTL_NAME(0)   }
+       { 0 }
 };
 
 static struct ctl_table kgnilnd_top_table[2] = {
        {
-               INIT_CTL_NAME(CTL_GNILND)
+               INIT_CTL_NAME
                .procname = "kgnilnd",
                .data     = NULL,
                .maxlen   = 0,
                .mode     = 0555,
                .child    = kgnilnd_table
        },
-       {       INIT_CTL_NAME(0)   }
+       { 0 }
 };
 
 void kgnilnd_insert_sysctl(void)
index 1cae4eb..86ddef2 100644 (file)
@@ -80,7 +80,6 @@
 #include "libcfs/libcfs.h"
 #include "lnet/lnet.h"
 #include "lnet/lib-lnet.h"
-//#include <lnet/lnet-sysctl.h>
 
 #define MX_KERNEL 1
 #include "mx_extensions.h"
index 23165d1..5da8d89 100644 (file)
@@ -103,127 +103,99 @@ kmx_tunables_t kmxlnd_tunables = {
 
 static char ipif_basename_space[32];
 
-#ifndef HAVE_SYSCTL_UNNUMBERED
-
-enum {
-        MXLND_N_WAITD   = 1,
-        MXLND_MAX_PEERS,
-        MXLND_CKSUM,
-        MXLND_NNTX,
-        MXLND_CREDITS,
-        MXLND_BOARD,
-        MXLND_EP_ID,
-        MXLND_IPIF_BASENAME,
-        MXLND_POLLING
-};
-#else
-
-#define MXLND_N_WAITD           CTL_UNNUMBERED
-#define MXLND_MAX_PEERS         CTL_UNNUMBERED
-#define MXLND_CKSUM             CTL_UNNUMBERED
-#define MXLND_NNTX              CTL_UNNUMBERED
-#define MXLND_CREDITS           CTL_UNNUMBERED
-#define MXLND_BOARD             CTL_UNNUMBERED
-#define MXLND_EP_ID             CTL_UNNUMBERED
-#define MXLND_IPIF_BASENAME     CTL_UNNUMBERED
-#define MXLND_POLLING           CTL_UNNUMBERED
-
-#endif
-
 static struct ctl_table kmxlnd_ctl_table[] = {
-        {
-                .ctl_name = 1,
-                .procname = "n_waitd",
-                .data     = &n_waitd,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = 2,
-                .procname = "max_peers",
-                .data     = &max_peers,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = 3,
-                .procname = "cksum",
-                .data     = &cksum,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = 4,
-                .procname = "ntx",
-                .data     = &ntx,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = 5,
-                .procname = "credits",
-                .data     = &credits,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = 6,
-                .procname = "peercredits",
-                .data     = &peercredits,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = 7,
-                .procname = "board",
-                .data     = &board,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = 8,
-                .procname = "ep_id",
-                .data     = &ep_id,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = 9,
-                .procname = "ipif_name",
-                .data     = ipif_basename_space,
-                .maxlen   = sizeof(ipif_basename_space),
-                .mode     = 0444,
-                .proc_handler = &proc_dostring
-        },
-        {
-                .ctl_name = 10,
-                .procname = "polling",
-                .data     = &polling,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {0}
+       {
+               INIT_CTL_NAME
+               .procname       = "n_waitd",
+               .data           = &n_waitd,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "max_peers",
+               .data           = &max_peers,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "cksum",
+               .data           = &cksum,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "ntx",
+               .data           = &ntx,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "credits",
+               .data           = &credits,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "peercredits",
+               .data           = &peercredits,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "board",
+               .data           = &board,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "ep_id",
+               .data           = &ep_id,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               .procname       = "ipif_name",
+               .data           = ipif_basename_space,
+               .maxlen         = sizeof(ipif_basename_space),
+               .mode           = 0444,
+               .proc_handler   = &proc_dostring
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "polling",
+               .data           = &polling,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       { 0 }
 };
 
 static struct ctl_table kmxlnd_top_ctl_table[] = {
         {
-                .ctl_name = 208,
-                .procname = "mxlnd",
-                .data     = NULL,
-                .maxlen   = 0,
-                .mode     = 0555,
-                .child    = kmxlnd_ctl_table
-        },
-        {0}
+               INIT_CTL_NAME
+               .procname       = "mxlnd",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0555,
+               .child          = kmxlnd_ctl_table
+       },
+       { 0 }
 };
 
 void
index 9ca97d0..0bd5d94 100644 (file)
@@ -71,7 +71,6 @@
 #include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-lnet.h>
-#include <lnet/lnet-sysctl.h>
 
 #ifdef HAVE_COMPAT_RDMA
 #include <linux/compat-2.6.h>
index 5f900bd..2e36334 100644 (file)
@@ -180,240 +180,188 @@ kib_tunables_t kiblnd_tunables = {
 
 static char ipif_basename_space[32];
 
-#ifndef HAVE_SYSCTL_UNNUMBERED
-
-enum {
-        O2IBLND_SERVICE  = 1,
-        O2IBLND_CKSUM,
-        O2IBLND_TIMEOUT,
-        O2IBLND_NTX,
-        O2IBLND_CREDITS,
-        O2IBLND_PEER_TXCREDITS,
-        O2IBLND_PEER_CREDITS_HIW,
-        O2IBLND_PEER_RTRCREDITS,
-        O2IBLND_PEER_TIMEOUT,
-        O2IBLND_IPIF_BASENAME,
-        O2IBLND_RETRY_COUNT,
-        O2IBLND_RNR_RETRY_COUNT,
-        O2IBLND_KEEPALIVE,
-        O2IBLND_CONCURRENT_SENDS,
-        O2IBLND_IB_MTU,
-        O2IBLND_MAP_ON_DEMAND,
-        O2IBLND_FMR_POOL_SIZE,
-        O2IBLND_FMR_FLUSH_TRIGGER,
-        O2IBLND_FMR_CACHE,
-        O2IBLND_PMR_POOL_SIZE,
-        O2IBLND_DEV_FAILOVER
-};
-#else
-
-#define O2IBLND_SERVICE          CTL_UNNUMBERED
-#define O2IBLND_CKSUM            CTL_UNNUMBERED
-#define O2IBLND_TIMEOUT          CTL_UNNUMBERED
-#define O2IBLND_NTX              CTL_UNNUMBERED
-#define O2IBLND_CREDITS          CTL_UNNUMBERED
-#define O2IBLND_PEER_TXCREDITS   CTL_UNNUMBERED
-#define O2IBLND_PEER_CREDITS_HIW CTL_UNNUMBERED
-#define O2IBLND_PEER_RTRCREDITS  CTL_UNNUMBERED
-#define O2IBLND_PEER_TIMEOUT     CTL_UNNUMBERED
-#define O2IBLND_IPIF_BASENAME    CTL_UNNUMBERED
-#define O2IBLND_RETRY_COUNT      CTL_UNNUMBERED
-#define O2IBLND_RNR_RETRY_COUNT  CTL_UNNUMBERED
-#define O2IBLND_KEEPALIVE        CTL_UNNUMBERED
-#define O2IBLND_CONCURRENT_SENDS CTL_UNNUMBERED
-#define O2IBLND_IB_MTU           CTL_UNNUMBERED
-#define O2IBLND_MAP_ON_DEMAND    CTL_UNNUMBERED
-#define O2IBLND_FMR_POOL_SIZE    CTL_UNNUMBERED
-#define O2IBLND_FMR_FLUSH_TRIGGER CTL_UNNUMBERED
-#define O2IBLND_FMR_CACHE        CTL_UNNUMBERED
-#define O2IBLND_PMR_POOL_SIZE    CTL_UNNUMBERED
-#define O2IBLND_DEV_FAILOVER     CTL_UNNUMBERED
-
-#endif
-
 static struct ctl_table kiblnd_ctl_table[] = {
-        {
-                .ctl_name = O2IBLND_SERVICE,
-                .procname = "service",
-                .data     = &service,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_CKSUM,
-                .procname = "cksum",
-                .data     = &cksum,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_TIMEOUT,
-                .procname = "timeout",
-                .data     = &timeout,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_NTX,
-                .procname = "ntx",
-                .data     = &ntx,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_CREDITS,
-                .procname = "credits",
-                .data     = &credits,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_PEER_TXCREDITS,
-                .procname = "peer_credits",
-                .data     = &peer_credits,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_PEER_CREDITS_HIW,
-                .procname = "peer_credits_hiw",
-                .data     = &peer_credits_hiw,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_PEER_RTRCREDITS,
-                .procname = "peer_buffer_credits",
-                .data     = &peer_buffer_credits,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_PEER_TIMEOUT,
-                .procname = "peer_timeout",
-                .data     = &peer_timeout,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_IPIF_BASENAME,
-                .procname = "ipif_name",
-                .data     = ipif_basename_space,
-                .maxlen   = sizeof(ipif_basename_space),
-                .mode     = 0444,
-                .proc_handler = &proc_dostring
-        },
-        {
-                .ctl_name = O2IBLND_RETRY_COUNT,
-                .procname = "retry_count",
-                .data     = &retry_count,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_RNR_RETRY_COUNT,
-                .procname = "rnr_retry_count",
-                .data     = &rnr_retry_count,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_KEEPALIVE,
-                .procname = "keepalive",
-                .data     = &keepalive,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_CONCURRENT_SENDS,
-                .procname = "concurrent_sends",
-                .data     = &concurrent_sends,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_IB_MTU,
-                .procname = "ib_mtu",
-                .data     = &ib_mtu,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_MAP_ON_DEMAND,
-                .procname = "map_on_demand",
-                .data     = &map_on_demand,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-
-        {
-                .ctl_name = O2IBLND_FMR_POOL_SIZE,
-                .procname = "fmr_pool_size",
-                .data     = &fmr_pool_size,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_FMR_FLUSH_TRIGGER,
-                .procname = "fmr_flush_trigger",
-                .data     = &fmr_flush_trigger,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_FMR_CACHE,
-                .procname = "fmr_cache",
-                .data     = &fmr_cache,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_PMR_POOL_SIZE,
-                .procname = "pmr_pool_size",
-                .data     = &pmr_pool_size,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = O2IBLND_DEV_FAILOVER,
-                .procname = "dev_failover",
-                .data     = &dev_failover,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {0}
+       {
+               INIT_CTL_NAME
+               .procname       = "service",
+               .data           = &service,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "cksum",
+               .data           = &cksum,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "timeout",
+               .data           = &timeout,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "ntx",
+               .data           = &ntx,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "credits",
+               .data           = &credits,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "peer_credits",
+               .data           = &peer_credits,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "peer_credits_hiw",
+               .data           = &peer_credits_hiw,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "peer_buffer_credits",
+               .data           = &peer_buffer_credits,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "peer_timeout",
+               .data           = &peer_timeout,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "ipif_name",
+               .data           = ipif_basename_space,
+               .maxlen         = sizeof(ipif_basename_space),
+               .mode           = 0444,
+               .proc_handler   = &proc_dostring
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "retry_count",
+               .data           = &retry_count,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "rnr_retry_count",
+               .data           = &rnr_retry_count,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "keepalive",
+               .data           = &keepalive,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "concurrent_sends",
+               .data           = &concurrent_sends,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "ib_mtu",
+               .data           = &ib_mtu,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "map_on_demand",
+               .data           = &map_on_demand,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "fmr_pool_size",
+               .data           = &fmr_pool_size,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "fmr_flush_trigger",
+               .data           = &fmr_flush_trigger,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "fmr_cache",
+               .data           = &fmr_cache,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "pmr_pool_size",
+               .data           = &pmr_pool_size,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "dev_failover",
+               .data           = &dev_failover,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       { 0 }
 };
 
 static struct ctl_table kiblnd_top_ctl_table[] = {
-        {
-                .ctl_name = CTL_O2IBLND,
-                .procname = "o2iblnd",
-                .data     = NULL,
-                .maxlen   = 0,
-                .mode     = 0555,
-                .child    = kiblnd_ctl_table
-        },
-        {0}
+       {
+               INIT_CTL_NAME
+               .procname       = "o2iblnd",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0555,
+               .child          = kiblnd_ctl_table
+       },
+       { 0 }
 };
 
 void
index b45c2cd..cea5d40 100644 (file)
@@ -70,7 +70,6 @@
 #include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-lnet.h>
-#include <lnet/lnet-sysctl.h>
 
 /* fixed constants */
 #define KQSW_SMALLMSG                  (4<<10)  /* small/large ep receiver breakpoint */
index 47a3c71..f3dcfbf 100644 (file)
@@ -86,141 +86,110 @@ kqswnal_tunables_t kqswnal_tunables = {
 
 #if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
 
-#ifndef HAVE_SYSCTL_UNNUMBERED
-
-enum
-       KQSWNAL_TX_MAXCONTIG = 1,
-       KQSWNAL_NTXMSG,
-       KQSWNAL_CREDITS,
-       KQSWNAL_PEERCREDITS,
-       KQSWNAL_NRXMSGS_LARGE,
-       KQSWNAL_EP_ENVELOPES_LARGE,
-       KQSWNAL_NRXMSGS_SMALL,
-       KQSWNAL_EP_ENVELOPES_SMALL,
-       KQSWNAL_OPTIMIZED_PUTS,
-       KQSWNAL_OPTIMIZED_GETS,
-       KQSWNAL_INJECT_CSUM_ERROR
-};
-#else
-
-#define KQSWNAL_TX_MAXCONTIG    CTL_UNNUMBERED
-#define KQSWNAL_NTXMSG          CTL_UNNUMBERED
-#define KQSWNAL_CREDITS         CTL_UNNUMBERED
-#define KQSWNAL_PEERCREDITS     CTL_UNNUMBERED
-#define KQSWNAL_NRXMSGS_LARGE   CTL_UNNUMBERED
-#define KQSWNAL_EP_ENVELOPES_LARGE CTL_UNNUMBERED
-#define KQSWNAL_NRXMSGS_SMALL   CTL_UNNUMBERED
-#define KQSWNAL_EP_ENVELOPES_SMALL CTL_UNNUMBERED
-#define KQSWNAL_OPTIMIZED_PUTS  CTL_UNNUMBERED
-#define KQSWNAL_OPTIMIZED_GETS  CTL_UNNUMBERED
-#define KQSWNAL_INJECT_CSUM_ERROR CTL_UNNUMBERED
-
-#endif
-
 static struct ctl_table kqswnal_ctl_table[] = {
-        {
-                .ctl_name = KQSWNAL_TX_MAXCONTIG,
-                .procname = "tx_maxcontig",
-                .data     = &tx_maxcontig,
-                .maxlen   = sizeof (int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KQSWNAL_NTXMSG,
-                .procname = "ntxmsgs",
-                .data     = &ntxmsgs,
-                .maxlen   = sizeof (int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KQSWNAL_CREDITS,
-                .procname = "credits",
-                .data     = &credits,
-                .maxlen   = sizeof (int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KQSWNAL_PEERCREDITS,
-                .procname = "peer_credits",
-                .data     = &peer_credits,
-                .maxlen   = sizeof (int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KQSWNAL_NRXMSGS_LARGE,
-                .procname = "nrxmsgs_large",
-                .data     = &nrxmsgs_large,
-                .maxlen   = sizeof (int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KQSWNAL_EP_ENVELOPES_LARGE,
-                .procname = "ep_envelopes_large",
-                .data     = &ep_envelopes_large,
-                .maxlen   = sizeof (int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KQSWNAL_NRXMSGS_SMALL,
-                .procname = "nrxmsgs_small",
-                .data     = &nrxmsgs_small,
-                .maxlen   = sizeof (int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KQSWNAL_EP_ENVELOPES_SMALL,
-                .procname = "ep_envelopes_small",
-                .data     = &ep_envelopes_small,
-                .maxlen   = sizeof (int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KQSWNAL_OPTIMIZED_PUTS,
-                .procname = "optimized_puts",
-                .data     = &optimized_puts,
-                .maxlen   = sizeof (int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KQSWNAL_OPTIMIZED_GETS,
-                .procname = "optimized_gets",
-                .data     = &optimized_gets,
-                .maxlen   = sizeof (int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
+       {
+               INIT_CTL_NAME
+               .procname       = "tx_maxcontig",
+               .data           = &tx_maxcontig,
+               .maxlen         = sizeof (int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "ntxmsgs",
+               .data           = &ntxmsgs,
+               .maxlen         = sizeof (int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "credits",
+               .data           = &credits,
+               .maxlen         = sizeof (int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "peer_credits",
+               .data           = &peer_credits,
+               .maxlen         = sizeof (int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "nrxmsgs_large",
+               .data           = &nrxmsgs_large,
+               .maxlen         = sizeof (int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "ep_envelopes_large",
+               .data           = &ep_envelopes_large,
+               .maxlen         = sizeof (int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "nrxmsgs_small",
+               .data           = &nrxmsgs_small,
+               .maxlen         = sizeof (int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "ep_envelopes_small",
+               .data           = &ep_envelopes_small,
+               .maxlen         = sizeof (int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "optimized_puts",
+               .data           = &optimized_puts,
+               .maxlen         = sizeof (int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "optimized_gets",
+               .data           = &optimized_gets,
+               .maxlen         = sizeof (int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
 #if KQSW_CKSUM
-        {
-                .ctl_name = KQSWNAL_INJECT_CSUM_ERROR,
-                .procname = "inject_csum_error",
-                .data     = &inject_csum_error,
-                .maxlen   = sizeof (int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
+       {
+               INIT_CTL_NAME
+               .procname       = "inject_csum_error",
+               .data           = &inject_csum_error,
+               .maxlen         = sizeof (int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
 #endif
-        {0}
+       { 0 }
 };
 
 static struct ctl_table kqswnal_top_ctl_table[] = {
-        {
-                .ctl_name = CTL_KQSWNAL,
-                .procname = "qswnal",
-                .data     = NULL,
-                .maxlen   = 0,
-                .mode     = 0555,
-                .child    = kqswnal_ctl_table
-        },
-        {0}
+       {
+               INIT_CTL_NAME
+               .procname       = "qswnal",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0555,
+               .child          = kqswnal_ctl_table
+       },
+       { 0 }
 };
 
 int
index 72559ee..fb7aa20 100644 (file)
@@ -66,7 +66,6 @@
 #include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lnet/lib-lnet.h>
-#include <lnet/lnet-sysctl.h>
 
 #include <rapl.h>
 
index 79f1572..2d5e64f 100644 (file)
@@ -88,117 +88,92 @@ kra_tunables_t kranal_tunables = {
 
 #if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
 
-#ifndef HAVE_SYSCTL_UNNUMBERED
-enum {
-        KRANAL_N_CONND = 1,
-        KRANAL_RECONNECT_MIN,
-        KRANAL_RECONNECT_MAX,
-        KRANAL_NTX,
-        KRANAL_CREDITS,
-        KRANAL_PEERCREDITS,
-        KRANAL_FMA_CQ_SIZE,
-        KRANAL_TIMEOUT,
-        KRANAL_IMMEDIATE_MAX
-};
-#else
-
-#define KRANAL_N_CONND          CTL_UNNUMBERED
-#define KRANAL_RECONNECT_MIN    CTL_UNNUMBERED
-#define KRANAL_RECONNECT_MAX    CTL_UNNUMBERED
-#define KRANAL_NTX              CTL_UNNUMBERED
-#define KRANAL_CREDITS          CTL_UNNUMBERED
-#define KRANAL_PEERCREDITS      CTL_UNNUMBERED
-#define KRANAL_FMA_CQ_SIZE      CTL_UNNUMBERED
-#define KRANAL_TIMEOUT          CTL_UNNUMBERED
-#define KRENAL_IMMEDIATE_MAX    CTL_UNNUMBERED
-#endif
-
 static struct ctl_table kranal_ctl_table[] = {
-        {
-                .ctl_name = KRANAL_N_CONND,
-                .procname = "n_connd",
-                .data     = &n_connd,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KRANAL_RECONNECT_MIN,
-                .procname = "min_reconnect_interval",
-                .data     = &min_reconnect_interval,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KRANAL_RECONNECT_MAX,
-                .procname = "max_reconnect_interval",
-                .data     = &max_reconnect_interval,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KRANAL_NTX,
-                .procname = "ntx",
-                .data     = &ntx,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KRANAL_CREDITS,
-                .procname = "credits",
-                .data     = &credits,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KRANAL_PEERCREDITS,
-                .procname = "peer_credits",
-                .data     = &peer_credits,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KRANAL_FMA_CQ_SIZE,
-                .procname = "fma_cq_size",
-                .data     = &fma_cq_size,
-                .maxlen   = sizeof(int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KRANAL_TIMEOUT,
-                .procname = "timeout",
-                .data     = &timeout,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = KRANAL_IMMEDIATE_MAX,
-                .procname = "max_immediate",
-                .data     = &max_immediate,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {0}
+       {
+               INIT_CTL_NAME
+               .procname       = "n_connd",
+               .data           = &n_connd,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "min_reconnect_interval",
+               .data           = &min_reconnect_interval,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "max_reconnect_interval",
+               .data           = &max_reconnect_interval,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "ntx",
+               .data           = &ntx,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "credits",
+               .data           = &credits,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "peer_credits",
+               .data           = &peer_credits,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "fma_cq_size",
+               .data           = &fma_cq_size,
+               .maxlen         = sizeof(int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "timeout",
+               .data           = &timeout,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "max_immediate",
+               .data           = &max_immediate,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       { 0 }
 };
 
 static struct ctl_table kranal_top_ctl_table[] = {
-        {
-                .ctl_name = CTL_KRANAL,
-                .procname = "ranal",
-                .data     = NULL,
-                .maxlen   = 0,
-                .mode     = 0555,
-                .child    = kranal_ctl_table
-        },
-        {0}
+       {
+               INIT_CTL_NAME
+               .procname       = "ranal",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0555,
+               .child          = kranal_ctl_table
+       },
+       { 0 }
 };
 
 int
index 81f2fcd..b16767c 100644 (file)
@@ -42,7 +42,6 @@
 #include <lnet/lnet.h>
 #include <lnet/lib-lnet.h>
 #include <lnet/socklnd.h>
-#include <lnet/lnet-sysctl.h>
 
 #define SOCKNAL_PEER_HASH_SIZE  101             /* # peer lists */
 #define SOCKNAL_RESCHED         100             /* # scheduler loops before reschedule */
index fa66f21..54513ad 100644 (file)
 
 # if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
 
-#ifndef HAVE_SYSCTL_UNNUMBERED
-
-enum {
-        SOCKLND_TIMEOUT = 1,
-        SOCKLND_CREDITS,
-        SOCKLND_PEER_TXCREDITS,
-        SOCKLND_PEER_RTRCREDITS,
-        SOCKLND_PEER_TIMEOUT,
-        SOCKLND_NCONNDS,
-        SOCKLND_RECONNECTS_MIN,
-        SOCKLND_RECONNECTS_MAX,
-        SOCKLND_EAGER_ACK,
-        SOCKLND_ZERO_COPY,
-        SOCKLND_TYPED,
-        SOCKLND_BULK_MIN,
-        SOCKLND_RX_BUFFER_SIZE,
-        SOCKLND_TX_BUFFER_SIZE,
-        SOCKLND_NAGLE,
-        SOCKLND_IRQ_AFFINITY,
-        SOCKLND_ROUND_ROBIN,
-        SOCKLND_KEEPALIVE,
-        SOCKLND_KEEPALIVE_IDLE,
-        SOCKLND_KEEPALIVE_COUNT,
-        SOCKLND_KEEPALIVE_INTVL,
-        SOCKLND_BACKOFF_INIT,
-        SOCKLND_BACKOFF_MAX,
-        SOCKLND_PROTOCOL,
-        SOCKLND_ZERO_COPY_RECV,
-        SOCKLND_ZERO_COPY_RECV_MIN_NFRAGS
-};
-#else
-
-#define SOCKLND_TIMEOUT         CTL_UNNUMBERED
-#define SOCKLND_CREDITS         CTL_UNNUMBERED
-#define SOCKLND_PEER_TXCREDITS  CTL_UNNUMBERED
-#define SOCKLND_PEER_RTRCREDITS  CTL_UNNUMBERED
-#define SOCKLND_PEER_TIMEOUT    CTL_UNNUMBERED
-#define SOCKLND_NCONNDS         CTL_UNNUMBERED
-#define SOCKLND_RECONNECTS_MIN  CTL_UNNUMBERED
-#define SOCKLND_RECONNECTS_MAX  CTL_UNNUMBERED
-#define SOCKLND_EAGER_ACK       CTL_UNNUMBERED
-#define SOCKLND_ZERO_COPY       CTL_UNNUMBERED
-#define SOCKLND_TYPED           CTL_UNNUMBERED
-#define SOCKLND_BULK_MIN        CTL_UNNUMBERED
-#define SOCKLND_RX_BUFFER_SIZE  CTL_UNNUMBERED
-#define SOCKLND_TX_BUFFER_SIZE  CTL_UNNUMBERED
-#define SOCKLND_NAGLE           CTL_UNNUMBERED
-#define SOCKLND_IRQ_AFFINITY    CTL_UNNUMBERED
-#define SOCKLND_ROUND_ROBIN     CTL_UNNUMBERED
-#define SOCKLND_KEEPALIVE       CTL_UNNUMBERED
-#define SOCKLND_KEEPALIVE_IDLE  CTL_UNNUMBERED
-#define SOCKLND_KEEPALIVE_COUNT CTL_UNNUMBERED
-#define SOCKLND_KEEPALIVE_INTVL CTL_UNNUMBERED
-#define SOCKLND_BACKOFF_INIT    CTL_UNNUMBERED
-#define SOCKLND_BACKOFF_MAX     CTL_UNNUMBERED
-#define SOCKLND_PROTOCOL        CTL_UNNUMBERED
-#define SOCKLND_ZERO_COPY_RECV  CTL_UNNUMBERED
-#define SOCKLND_ZERO_COPY_RECV_MIN_NFRAGS CTL_UNNUMBERED
-#endif
-
 static struct ctl_table ksocknal_ctl_table[] = {
-        {
-                .ctl_name = SOCKLND_TIMEOUT,
-                .procname = "timeout",
-                .data     = &ksocknal_tunables.ksnd_timeout,
-                .maxlen   = sizeof (int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_CREDITS,
-                .procname = "credits",
-                .data     = &ksocknal_tunables.ksnd_credits,
-                .maxlen   = sizeof (int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-         {
-                .ctl_name = SOCKLND_PEER_TXCREDITS,
-                .procname = "peer_credits",
-                .data     = &ksocknal_tunables.ksnd_peertxcredits,
-                .maxlen   = sizeof (int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-         {
-                .ctl_name = SOCKLND_PEER_RTRCREDITS,
-                .procname = "peer_buffer_credits",
-                .data     = &ksocknal_tunables.ksnd_peerrtrcredits,
-                .maxlen   = sizeof (int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_PEER_TIMEOUT,
-                .procname = "peer_timeout",
-                .data     = &ksocknal_tunables.ksnd_peertimeout,
-                .maxlen   = sizeof (int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_NCONNDS,
-                .procname = "nconnds",
-                .data     = &ksocknal_tunables.ksnd_nconnds,
-                .maxlen   = sizeof (int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_RECONNECTS_MIN,
-                .procname = "min_reconnectms",
-                .data     = &ksocknal_tunables.ksnd_min_reconnectms,
-                .maxlen   = sizeof (int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_RECONNECTS_MAX,
-                .procname = "max_reconnectms",
-                .data     = &ksocknal_tunables.ksnd_max_reconnectms,
-                .maxlen   = sizeof (int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_EAGER_ACK,
-                .procname = "eager_ack",
-                .data     = &ksocknal_tunables.ksnd_eager_ack,
-                .maxlen   = sizeof (int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_ZERO_COPY,
-                .procname = "zero_copy",
-                .data     = &ksocknal_tunables.ksnd_zc_min_payload,
-                .maxlen   = sizeof (int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_ZERO_COPY_RECV,
-                .procname = "zero_copy_recv",
-                .data     = &ksocknal_tunables.ksnd_zc_recv,
-                .maxlen   = sizeof (int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-
-        {
-                .ctl_name = SOCKLND_ZERO_COPY_RECV_MIN_NFRAGS,
-                .procname = "zero_copy_recv",
-                .data     = &ksocknal_tunables.ksnd_zc_recv_min_nfrags,
-                .maxlen   = sizeof (int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_TYPED,
-                .procname = "typed",
-                .data     = &ksocknal_tunables.ksnd_typed_conns,
-                .maxlen   = sizeof (int),
-                .mode     = 0444,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_BULK_MIN,
-                .procname = "min_bulk",
-                .data     = &ksocknal_tunables.ksnd_min_bulk,
-                .maxlen   = sizeof (int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_RX_BUFFER_SIZE,
-                .procname = "rx_buffer_size",
-                .data     = &ksocknal_tunables.ksnd_rx_buffer_size,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_TX_BUFFER_SIZE,
-                .procname = "tx_buffer_size",
-                .data     = &ksocknal_tunables.ksnd_tx_buffer_size,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_NAGLE,
-                .procname = "nagle",
-                .data     = &ksocknal_tunables.ksnd_nagle,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
+       {
+               INIT_CTL_NAME
+               .procname       = "timeout",
+               .data           = &ksocknal_tunables.ksnd_timeout,
+               .maxlen         = sizeof (int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "credits",
+               .data           = &ksocknal_tunables.ksnd_credits,
+               .maxlen         = sizeof (int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "peer_credits",
+               .data           = &ksocknal_tunables.ksnd_peertxcredits,
+               .maxlen         = sizeof (int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "peer_buffer_credits",
+               .data           = &ksocknal_tunables.ksnd_peerrtrcredits,
+               .maxlen         = sizeof (int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "peer_timeout",
+               .data           = &ksocknal_tunables.ksnd_peertimeout,
+               .maxlen         = sizeof (int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "nconnds",
+               .data           = &ksocknal_tunables.ksnd_nconnds,
+               .maxlen         = sizeof (int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "min_reconnectms",
+               .data           = &ksocknal_tunables.ksnd_min_reconnectms,
+               .maxlen         = sizeof (int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "max_reconnectms",
+               .data           = &ksocknal_tunables.ksnd_max_reconnectms,
+               .maxlen         = sizeof (int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "eager_ack",
+               .data           = &ksocknal_tunables.ksnd_eager_ack,
+               .maxlen         = sizeof (int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "zero_copy",
+               .data           = &ksocknal_tunables.ksnd_zc_min_payload,
+               .maxlen         = sizeof (int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "zero_copy_recv",
+               .data           = &ksocknal_tunables.ksnd_zc_recv,
+               .maxlen         = sizeof (int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "zero_copy_recv",
+               .data           = &ksocknal_tunables.ksnd_zc_recv_min_nfrags,
+               .maxlen         = sizeof (int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "typed",
+               .data           = &ksocknal_tunables.ksnd_typed_conns,
+               .maxlen         = sizeof (int),
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "min_bulk",
+               .data           = &ksocknal_tunables.ksnd_min_bulk,
+               .maxlen         = sizeof (int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "rx_buffer_size",
+               .data           = &ksocknal_tunables.ksnd_rx_buffer_size,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "tx_buffer_size",
+               .data           = &ksocknal_tunables.ksnd_tx_buffer_size,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "nagle",
+               .data           = &ksocknal_tunables.ksnd_nagle,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
 #ifdef CPU_AFFINITY
-        {
-                .ctl_name = SOCKLND_IRQ_AFFINITY,
-                .procname = "irq_affinity",
-                .data     = &ksocknal_tunables.ksnd_irq_affinity,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
+       {
+               INIT_CTL_NAME
+               .procname       = "irq_affinity",
+               .data           = &ksocknal_tunables.ksnd_irq_affinity,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
 #endif
-        {
-                .ctl_name = SOCKLND_ROUND_ROBIN,
-                .procname = "round_robin",
-                .data     = &ksocknal_tunables.ksnd_round_robin,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_KEEPALIVE,
-                .procname = "keepalive",
-                .data     = &ksocknal_tunables.ksnd_keepalive,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_KEEPALIVE_IDLE,
-                .procname = "keepalive_idle",
-                .data     = &ksocknal_tunables.ksnd_keepalive_idle,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_KEEPALIVE_COUNT,
-                .procname = "keepalive_count",
-                .data     = &ksocknal_tunables.ksnd_keepalive_count,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_KEEPALIVE_INTVL,
-                .procname = "keepalive_intvl",
-                .data     = &ksocknal_tunables.ksnd_keepalive_intvl,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
+       {
+               INIT_CTL_NAME
+               .procname       = "round_robin",
+               .data           = &ksocknal_tunables.ksnd_round_robin,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "keepalive",
+               .data           = &ksocknal_tunables.ksnd_keepalive,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "keepalive_idle",
+               .data           = &ksocknal_tunables.ksnd_keepalive_idle,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "keepalive_count",
+               .data           = &ksocknal_tunables.ksnd_keepalive_count,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "keepalive_intvl",
+               .data           = &ksocknal_tunables.ksnd_keepalive_intvl,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
 #ifdef SOCKNAL_BACKOFF
-        {
-                .ctl_name = SOCKLND_BACKOFF_INIT,
-                .procname = "backoff_init",
-                .data     = &ksocknal_tunables.ksnd_backoff_init,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
-        {
-                .ctl_name = SOCKLND_BACKOFF_MAX,
-                .procname = "backoff_max",
-                .data     = &ksocknal_tunables.ksnd_backoff_max,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
+       {
+               INIT_CTL_NAME
+               .procname       = "backoff_init",
+               .data           = &ksocknal_tunables.ksnd_backoff_init,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "backoff_max",
+               .data           = &ksocknal_tunables.ksnd_backoff_max,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
 #endif
 #if SOCKNAL_VERSION_DEBUG
-        {
-                .ctl_name = SOCKLND_PROTOCOL,
-                .procname = "protocol",
-                .data     = &ksocknal_tunables.ksnd_protocol,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec,
-                .strategy = &sysctl_intvec,
-        },
+       {
+               INIT_CTL_NAME
+               .procname       = "protocol",
+               .data           = &ksocknal_tunables.ksnd_protocol,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec,
+               INIT_STRATEGY
+       },
 #endif
-        {0}
+       { 0 }
 };
 
-
 struct ctl_table ksocknal_top_ctl_table[] = {
-        {
-                .ctl_name = CTL_SOCKLND,
-                .procname = "socknal",
-                .data     = NULL,
-                .maxlen   = 0,
-                .mode     = 0555,
-                .child    = ksocknal_ctl_table
-        },
-        { 0 }
+       {
+               INIT_CTL_NAME
+               .procname       = "socknal",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0555,
+               .child          = ksocknal_ctl_table
+       },
+       { 0 }
 };
 
 int
index 5bbcbb7..f913e40 100644 (file)
 
 static struct ctl_table_header *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
-
 #define LNET_LOFFT_BITS                (sizeof(loff_t) * 8)
 /*
  * NB: max allowed LNET_CPT_BITS is 8 on 64-bit system and 2 on 32-bit system
@@ -857,69 +835,65 @@ out:
 DECLARE_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(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,
+       /*
+        * 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 struct ctl_table top_table[] = {
-        {
-                INIT_CTL_NAME(CTL_LNET)
-                .procname = "lnet",
-                .mode     = 0555,
-                .data     = NULL,
-                .maxlen   = 0,
-                .child    = lnet_table,
-        },
-        {
-                INIT_CTL_NAME(0)
-        }
+       {
+               INIT_CTL_NAME
+               .procname       = "lnet",
+               .mode           = 0555,
+               .data           = NULL,
+               .maxlen         = 0,
+               .child          = lnet_table,
+       },
+       { 0 }
 };
 
 void
index 099cd04..e298a3a 100644 (file)
 struct ctl_table_header *obd_table_header = NULL;
 #endif
 
-#ifndef HAVE_SYSCTL_UNNUMBERED
-
-#define OBD_SYSCTL 300
-
-enum {
-        OBD_TIMEOUT = 3,        /* RPC timeout before recovery/intr */
-        OBD_DUMP_ON_TIMEOUT,    /* dump kernel debug log upon eviction */
-        OBD_MEMUSED,            /* bytes currently OBD_ALLOCated */
-        OBD_PAGESUSED,          /* pages currently OBD_PAGE_ALLOCated */
-        OBD_MAXMEMUSED,         /* maximum bytes OBD_ALLOCated concurrently */
-        OBD_MAXPAGESUSED,       /* maximum pages OBD_PAGE_ALLOCated concurrently */
-        OBD_SYNCFILTER,         /* XXX temporary, as we play with sync osts.. */
-        OBD_LDLM_TIMEOUT,       /* LDLM timeout for ASTs before client eviction */
-        OBD_DUMP_ON_EVICTION,   /* dump kernel debug log upon eviction */
-        OBD_DEBUG_PEER_ON_TIMEOUT, /* dump peer debug when RPC times out */
-        OBD_ALLOC_FAIL_RATE,    /* memory allocation random failure rate */
-        OBD_MAX_DIRTY_PAGES,    /* maximum dirty pages */
-        OBD_AT_MIN,             /* Adaptive timeouts params */
-        OBD_AT_MAX,
-        OBD_AT_EXTRA,
-        OBD_AT_EARLY_MARGIN,
-        OBD_AT_HISTORY,
-};
-
-#else
-
-#define OBD_SYSCTL              CTL_UNNUMBERED
-
-#define OBD_FAIL_LOC            CTL_UNNUMBERED
-#define OBD_FAIL_VAL            CTL_UNNUMBERED
-#define OBD_TIMEOUT             CTL_UNNUMBERED
-#define OBD_DUMP_ON_TIMEOUT     CTL_UNNUMBERED
-#define OBD_MEMUSED             CTL_UNNUMBERED
-#define OBD_PAGESUSED           CTL_UNNUMBERED
-#define OBD_MAXMEMUSED          CTL_UNNUMBERED
-#define OBD_MAXPAGESUSED        CTL_UNNUMBERED
-#define OBD_SYNCFILTER          CTL_UNNUMBERED
-#define OBD_LDLM_TIMEOUT        CTL_UNNUMBERED
-#define OBD_DUMP_ON_EVICTION    CTL_UNNUMBERED
-#define OBD_DEBUG_PEER_ON_TIMEOUT CTL_UNNUMBERED
-#define OBD_ALLOC_FAIL_RATE     CTL_UNNUMBERED
-#define OBD_MAX_DIRTY_PAGES     CTL_UNNUMBERED
-#define OBD_AT_MIN              CTL_UNNUMBERED
-#define OBD_AT_MAX              CTL_UNNUMBERED
-#define OBD_AT_EXTRA            CTL_UNNUMBERED
-#define OBD_AT_EARLY_MARGIN     CTL_UNNUMBERED
-#define OBD_AT_HISTORY          CTL_UNNUMBERED
-
-#endif
-
 int LL_PROC_PROTO(proc_set_timeout)
 {
         int rc;
@@ -306,149 +256,149 @@ int LL_PROC_PROTO(proc_at_history)
 
 #ifdef CONFIG_SYSCTL
 static struct ctl_table obd_table[] = {
-        {
-                INIT_CTL_NAME(OBD_TIMEOUT)
-                .procname = "timeout",
-                .data     = &obd_timeout,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_set_timeout
-        },
-        {
-                INIT_CTL_NAME(OBD_DEBUG_PEER_ON_TIMEOUT)
-                .procname = "debug_peer_on_timeout",
-                .data     = &obd_debug_peer_on_timeout,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                INIT_CTL_NAME(OBD_DUMP_ON_TIMEOUT)
-                .procname = "dump_on_timeout",
-                .data     = &obd_dump_on_timeout,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                INIT_CTL_NAME(OBD_DUMP_ON_EVICTION)
-                .procname = "dump_on_eviction",
-                .data     = &obd_dump_on_eviction,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                INIT_CTL_NAME(OBD_MEMUSED)
-                .procname = "memused",
-                .data     = NULL,
-                .maxlen   = 0,
-                .mode     = 0444,
-                .proc_handler = &proc_memory_alloc
-        },
-        {
-                INIT_CTL_NAME(OBD_PAGESUSED)
-                .procname = "pagesused",
-                .data     = NULL,
-                .maxlen   = 0,
-                .mode     = 0444,
-                .proc_handler = &proc_pages_alloc
-        },
-        {
-                INIT_CTL_NAME(OBD_MAXMEMUSED)
-                .procname = "memused_max",
-                .data     = NULL,
-                .maxlen   = 0,
-                .mode     = 0444,
-                .proc_handler = &proc_mem_max
-        },
-        {
-                INIT_CTL_NAME(OBD_MAXPAGESUSED)
-                .procname = "pagesused_max",
-                .data     = NULL,
-                .maxlen   = 0,
-                .mode     = 0444,
-                .proc_handler = &proc_pages_max
-        },
-        {
-                INIT_CTL_NAME(OBD_LDLM_TIMEOUT)
-                .procname = "ldlm_timeout",
-                .data     = &ldlm_timeout,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_set_timeout
-        },
+       {
+               INIT_CTL_NAME
+               .procname       = "timeout",
+               .data           = &obd_timeout,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_set_timeout
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "debug_peer_on_timeout",
+               .data           = &obd_debug_peer_on_timeout,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "dump_on_timeout",
+               .data           = &obd_dump_on_timeout,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "dump_on_eviction",
+               .data           = &obd_dump_on_eviction,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_dointvec
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "memused",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0444,
+               .proc_handler   = &proc_memory_alloc
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "pagesused",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0444,
+               .proc_handler   = &proc_pages_alloc
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "memused_max",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0444,
+               .proc_handler   = &proc_mem_max
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "pagesused_max",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0444,
+               .proc_handler   = &proc_pages_max
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "ldlm_timeout",
+               .data           = &ldlm_timeout,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_set_timeout
+       },
 #ifdef RANDOM_FAIL_ALLOC
-        {
-                INIT_CTL_NAME(OBD_ALLOC_FAIL_RATE)
-                .procname = "alloc_fail_rate",
-                .data     = &obd_alloc_fail_rate,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_alloc_fail_rate
-        },
+       {
+               INIT_CTL_NAME
+               .procname       = "alloc_fail_rate",
+               .data           = &obd_alloc_fail_rate,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_alloc_fail_rate
+       },
 #endif
-        {
-                INIT_CTL_NAME(OBD_MAX_DIRTY_PAGES)
-                .procname = "max_dirty_mb",
-                .data     = &obd_max_dirty_pages,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_max_dirty_pages_in_mb
-        },
-        {
-                INIT_CTL_NAME(OBD_AT_MIN)
-                .procname = "at_min",
-                .data     = &at_min,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_at_min
-        },
-        {
-                INIT_CTL_NAME(OBD_AT_MAX)
-                .procname = "at_max",
-                .data     = &at_max,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_at_max
-        },
-        {
-                INIT_CTL_NAME(OBD_AT_EXTRA)
-                .procname = "at_extra",
-                .data     = &at_extra,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_at_extra
-        },
-        {
-                INIT_CTL_NAME(OBD_AT_EARLY_MARGIN)
-                .procname = "at_early_margin",
-                .data     = &at_early_margin,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_at_early_margin
-        },
-        {
-                INIT_CTL_NAME(OBD_AT_HISTORY)
-                .procname = "at_history",
-                .data     = &at_history,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_at_history
-        },
-        {       INIT_CTL_NAME(0)    }
+       {
+               INIT_CTL_NAME
+               .procname       = "max_dirty_mb",
+               .data           = &obd_max_dirty_pages,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_max_dirty_pages_in_mb
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "at_min",
+               .data           = &at_min,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_at_min
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "at_max",
+               .data           = &at_max,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_at_max
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "at_extra",
+               .data           = &at_extra,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_at_extra
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "at_early_margin",
+               .data           = &at_early_margin,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_at_early_margin
+       },
+       {
+               INIT_CTL_NAME
+               .procname       = "at_history",
+               .data           = &at_history,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
+               .proc_handler   = &proc_at_history
+       },
+       { 0 }
 };
 
 static struct ctl_table parent_table[] = {
-        {
-                INIT_CTL_NAME(OBD_SYSCTL)
-                .procname = "lustre",
-                .data     = NULL,
-                .maxlen   = 0,
-                .mode     = 0555,
-                .child    = obd_table
-        },
-        {       INIT_CTL_NAME(0)   }
+       {
+               INIT_CTL_NAME
+               .procname       = "lustre",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0555,
+               .child          = obd_table
+       },
+       { 0 }
 };
 #endif