LU-2800 autoconf: clean up sysctl table handling

[fs/lustre-release.git] / lnet / klnds / qswlnd / qswlnd_modparams.c

diff --git a/lnet/klnds/qswlnd/qswlnd_modparams.c b/lnet/klnds/qswlnd/qswlnd_modparams.c
index 47a3c71..f3dcfbf 100644 (file)
--- a/lnet/klnds/qswlnd/qswlnd_modparams.c
+++ b/lnet/klnds/qswlnd/qswlnd_modparams.c
@@ -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