Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
LU-2800 autoconf: clean up sysctl table handling
[fs/lustre-release.git] / lnet / klnds / o2iblnd / o2iblnd_modparams.c
diff --git a/lnet/klnds/o2iblnd/o2iblnd_modparams.c b/lnet/klnds/o2iblnd/o2iblnd_modparams.c
index 5f900bd..2e36334 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd_modparams.c
+++ b/lnet/klnds/o2iblnd/o2iblnd_modparams.c
@@ -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
Lustre primary development and releases