LU-1346 gnilnd: remove libcfs abstractions

[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 03512c0..47a3c71 100644 (file)
--- a/lnet/klnds/qswlnd/qswlnd_modparams.c
+++ b/lnet/klnds/qswlnd/qswlnd_modparams.c
@@ -1,6 +1,7 @@
 /*
- * Copyright (C) 2002-2004 Cluster File Systems, Inc.
- *   Author: Eric Barton <eric@bartonsoftware.com>
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Author: Eric Barton <eric@bartonsoftware.com>
  *
  * This file is part of Portals, http://www.lustre.org
  *
@@ -83,10 +84,42 @@ kqswnal_tunables_t kqswnal_tunables = {
 #endif
 };
 
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
-static cfs_sysctl_table_t kqswnal_ctl_table[] = {
+#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 = 1,
+                .ctl_name = KQSWNAL_TX_MAXCONTIG,
                 .procname = "tx_maxcontig",
                 .data     = &tx_maxcontig,
                 .maxlen   = sizeof (int),
@@ -94,7 +127,7 @@ static cfs_sysctl_table_t kqswnal_ctl_table[] = {
                 .proc_handler = &proc_dointvec
         },
         {
-                .ctl_name = 2,
+                .ctl_name = KQSWNAL_NTXMSG,
                 .procname = "ntxmsgs",
                 .data     = &ntxmsgs,
                 .maxlen   = sizeof (int),
@@ -102,7 +135,7 @@ static cfs_sysctl_table_t kqswnal_ctl_table[] = {
                 .proc_handler = &proc_dointvec
         },
         {
-                .ctl_name = 3,
+                .ctl_name = KQSWNAL_CREDITS,
                 .procname = "credits",
                 .data     = &credits,
                 .maxlen   = sizeof (int),
@@ -110,7 +143,7 @@ static cfs_sysctl_table_t kqswnal_ctl_table[] = {
                 .proc_handler = &proc_dointvec
         },
         {
-                .ctl_name = 4,
+                .ctl_name = KQSWNAL_PEERCREDITS,
                 .procname = "peer_credits",
                 .data     = &peer_credits,
                 .maxlen   = sizeof (int),
@@ -118,7 +151,7 @@ static cfs_sysctl_table_t kqswnal_ctl_table[] = {
                 .proc_handler = &proc_dointvec
         },
         {
-                .ctl_name = 5,
+                .ctl_name = KQSWNAL_NRXMSGS_LARGE,
                 .procname = "nrxmsgs_large",
                 .data     = &nrxmsgs_large,
                 .maxlen   = sizeof (int),
@@ -126,7 +159,7 @@ static cfs_sysctl_table_t kqswnal_ctl_table[] = {
                 .proc_handler = &proc_dointvec
         },
         {
-                .ctl_name = 6,
+                .ctl_name = KQSWNAL_EP_ENVELOPES_LARGE,
                 .procname = "ep_envelopes_large",
                 .data     = &ep_envelopes_large,
                 .maxlen   = sizeof (int),
@@ -134,7 +167,7 @@ static cfs_sysctl_table_t kqswnal_ctl_table[] = {
                 .proc_handler = &proc_dointvec
         },
         {
-                .ctl_name = 7,
+                .ctl_name = KQSWNAL_NRXMSGS_SMALL,
                 .procname = "nrxmsgs_small",
                 .data     = &nrxmsgs_small,
                 .maxlen   = sizeof (int),
@@ -142,7 +175,7 @@ static cfs_sysctl_table_t kqswnal_ctl_table[] = {
                 .proc_handler = &proc_dointvec
         },
         {
-                .ctl_name = 8,
+                .ctl_name = KQSWNAL_EP_ENVELOPES_SMALL,
                 .procname = "ep_envelopes_small",
                 .data     = &ep_envelopes_small,
                 .maxlen   = sizeof (int),
@@ -150,7 +183,7 @@ static cfs_sysctl_table_t kqswnal_ctl_table[] = {
                 .proc_handler = &proc_dointvec
         },
         {
-                .ctl_name = 9,
+                .ctl_name = KQSWNAL_OPTIMIZED_PUTS,
                 .procname = "optimized_puts",
                 .data     = &optimized_puts,
                 .maxlen   = sizeof (int),
@@ -158,7 +191,7 @@ static cfs_sysctl_table_t kqswnal_ctl_table[] = {
                 .proc_handler = &proc_dointvec
         },
         {
-                .ctl_name = 10,
+                .ctl_name = KQSWNAL_OPTIMIZED_GETS,
                 .procname = "optimized_gets",
                 .data     = &optimized_gets,
                 .maxlen   = sizeof (int),
@@ -167,7 +200,7 @@ static cfs_sysctl_table_t kqswnal_ctl_table[] = {
         },
 #if KQSW_CKSUM
         {
-                .ctl_name = 11,
+                .ctl_name = KQSWNAL_INJECT_CSUM_ERROR,
                 .procname = "inject_csum_error",
                 .data     = &inject_csum_error,
                 .maxlen   = sizeof (int),
@@ -178,9 +211,9 @@ static cfs_sysctl_table_t kqswnal_ctl_table[] = {
         {0}
 };
 
-static cfs_sysctl_table_t kqswnal_top_ctl_table[] = {
+static struct ctl_table kqswnal_top_ctl_table[] = {
         {
-                .ctl_name = 201,
+                .ctl_name = CTL_KQSWNAL,
                 .procname = "qswnal",
                 .data     = NULL,
                 .maxlen   = 0,
@@ -193,20 +226,19 @@ static cfs_sysctl_table_t kqswnal_top_ctl_table[] = {
 int
 kqswnal_tunables_init ()
 {
-        kqswnal_tunables.kqn_sysctl =
-                cfs_register_sysctl_table(kqswnal_top_ctl_table, 0);
+       kqswnal_tunables.kqn_sysctl =
+               register_sysctl_table(kqswnal_top_ctl_table);
 
-        if (kqswnal_tunables.kqn_sysctl == NULL)
-                CWARN("Can't setup /proc tunables\n");
+       if (kqswnal_tunables.kqn_sysctl == NULL)
+               CWARN("Can't setup /proc tunables\n");
 
-        return 0;
+       return 0;
 }
 
-void
-kqswnal_tunables_fini ()
+void kqswnal_tunables_fini()
 {
-        if (kqswnal_tunables.kqn_sysctl != NULL)
-                cfs_unregister_sysctl_table(kqswnal_tunables.kqn_sysctl);
+       if (kqswnal_tunables.kqn_sysctl != NULL)
+               unregister_sysctl_table(kqswnal_tunables.kqn_sysctl);
 }
 #else
 int