LU-1346 gnilnd: remove libcfs abstractions

[fs/lustre-release.git] / lnet / klnds / mxlnd / mxlnd_modparams.c

diff --git a/lnet/klnds/mxlnd/mxlnd_modparams.c b/lnet/klnds/mxlnd/mxlnd_modparams.c
index c583838..23165d1 100644 (file)
--- a/lnet/klnds/mxlnd/mxlnd_modparams.c
+++ b/lnet/klnds/mxlnd/mxlnd_modparams.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
  * Copyright (C) 2006 Myricom, Inc.
@@ -47,9 +45,10 @@ static int n_waitd = MXLND_N_SCHED;
 CFS_MODULE_PARM(n_waitd, "i", int, 0444,
                 "# of completion daemons");
 
+/* this was used to allocate global rxs which are no londer used */
 static int max_peers = MXLND_MAX_PEERS;
 CFS_MODULE_PARM(max_peers, "i", int, 0444,
-                "maximum number of peers that may connect");
+                "Unused - was maximum number of peers that may connect");
 
 static int cksum = MXLND_CKSUM;
 CFS_MODULE_PARM(cksum, "i", int, 0644,
@@ -59,9 +58,14 @@ static int ntx = MXLND_NTX;
 CFS_MODULE_PARM(ntx, "i", int, 0444,
                 "# of total tx message descriptors");
 
-static int credits = MXLND_MSG_QUEUE_DEPTH;
+/* this duplicates ntx */
+static int credits = MXLND_NTX;
 CFS_MODULE_PARM(credits, "i", int, 0444,
-                "# concurrent sends");
+                "Unused - was # concurrent sends to all peers");
+
+static int peercredits = MXLND_MSG_QUEUE_DEPTH;
+CFS_MODULE_PARM(peercredits, "i", int, 0444,
+                "# concurrent sends to one peer");
 
 static int board = MXLND_MX_BOARD;
 CFS_MODULE_PARM(board, "i", int, 0444,
@@ -88,6 +92,7 @@ kmx_tunables_t kmxlnd_tunables = {
         .kmx_cksum              = &cksum,
         .kmx_ntx                = &ntx,
         .kmx_credits            = &credits,
+        .kmx_peercredits        = &peercredits,
         .kmx_board              = &board,
         .kmx_ep_id              = &ep_id,
         .kmx_default_ipif       = &ipif_name,
@@ -125,7 +130,7 @@ enum {
 
 #endif
 
-static cfs_sysctl_table_t kmxlnd_ctl_table[] = {
+static struct ctl_table kmxlnd_ctl_table[] = {
         {
                 .ctl_name = 1,
                 .procname = "n_waitd",
@@ -168,6 +173,14 @@ static cfs_sysctl_table_t kmxlnd_ctl_table[] = {
         },
         {
                 .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),
@@ -175,7 +188,7 @@ static cfs_sysctl_table_t kmxlnd_ctl_table[] = {
                 .proc_handler = &proc_dointvec
         },
         {
-                .ctl_name = 7,
+                .ctl_name = 8,
                 .procname = "ep_id",
                 .data     = &ep_id,
                 .maxlen   = sizeof(int),
@@ -183,7 +196,7 @@ static cfs_sysctl_table_t kmxlnd_ctl_table[] = {
                 .proc_handler = &proc_dointvec
         },
         {
-                .ctl_name = 8,
+                .ctl_name = 9,
                 .procname = "ipif_name",
                 .data     = ipif_basename_space,
                 .maxlen   = sizeof(ipif_basename_space),
@@ -191,7 +204,7 @@ static cfs_sysctl_table_t kmxlnd_ctl_table[] = {
                 .proc_handler = &proc_dostring
         },
         {
-                .ctl_name = 9,
+                .ctl_name = 10,
                 .procname = "polling",
                 .data     = &polling,
                 .maxlen   = sizeof(int),
@@ -201,7 +214,7 @@ static cfs_sysctl_table_t kmxlnd_ctl_table[] = {
         {0}
 };
 
-static cfs_sysctl_table_t kmxlnd_top_ctl_table[] = {
+static struct ctl_table kmxlnd_top_ctl_table[] = {
         {
                 .ctl_name = 208,
                 .procname = "mxlnd",
@@ -223,21 +236,21 @@ kmxlnd_initstrtunable(char *space, char *str, int size)
 void
 kmxlnd_sysctl_init (void)
 {
-        kmxlnd_initstrtunable(ipif_basename_space, ipif_name,
-                              sizeof(ipif_basename_space));
+       kmxlnd_initstrtunable(ipif_basename_space, ipif_name,
+                             sizeof(ipif_basename_space));
 
-        kmxlnd_tunables.kib_sysctl =
-                cfs_register_sysctl_table(kmxlnd_top_ctl_table, 0);
+       kmxlnd_tunables.kib_sysctl =
+               register_sysctl_table(kmxlnd_top_ctl_table);
 
-        if (kmxlnd_tunables.kib_sysctl == NULL)
-                CWARN("Can't setup /proc tunables\n");
+       if (kmxlnd_tunables.kib_sysctl == NULL)
+               CWARN("Can't setup /proc tunables\n");
 }
 
 void
 kmxlnd_sysctl_fini (void)
 {
-        if (kmxlnd_tunables.kib_sysctl != NULL)
-                cfs_unregister_sysctl_table(kmxlnd_tunables.kib_sysctl);
+       if (kmxlnd_tunables.kib_sysctl != NULL)
+               unregister_sysctl_table(kmxlnd_tunables.kib_sysctl);
 }
 
 #else