Whamcloud - gitweb
Branch b1_6
[fs/lustre-release.git] / lnet / klnds / openiblnd / openiblnd_modparams.c
index 693d38e..5e40f14 100644 (file)
@@ -33,35 +33,35 @@ CFS_MODULE_PARM(n_connd, "i", int, 0444,
 
 static int min_reconnect_interval = 1;
 CFS_MODULE_PARM(min_reconnect_interval, "i", int, 0644,
-               "minimum connection retry interval (seconds)");
+                "minimum connection retry interval (seconds)");
 
 static int max_reconnect_interval = 60;
 CFS_MODULE_PARM(max_reconnect_interval, "i", int, 0644,
-               "maximum connection retry interval (seconds)");
+                "maximum connection retry interval (seconds)");
 
 static int concurrent_peers = 1152;
 CFS_MODULE_PARM(concurrent_peers, "i", int, 0444,
-               "maximum number of peers that may connect");
+                "maximum number of peers that may connect");
 
 static int cksum = 0;
 CFS_MODULE_PARM(cksum, "i", int, 0644,
-               "set non-zero to enable message (not RDMA) checksums");
+                "set non-zero to enable message (not RDMA) checksums");
 
 static int timeout = 50;
 CFS_MODULE_PARM(timeout, "i", int, 0644,
-               "timeout (seconds)");
+                "timeout (seconds)");
 
 static int ntx = 384;
 CFS_MODULE_PARM(ntx, "i", int, 0444,
-               "# of message descriptors");
+                "# of message descriptors");
 
 static int credits = 256;
 CFS_MODULE_PARM(credits, "i", int, 0444,
-               "# concurrent sends");
+                "# concurrent sends");
 
 static int peer_credits = 16;
 CFS_MODULE_PARM(peer_credits, "i", int, 0444,
-               "# concurrent sends to 1 peer");
+                "# concurrent sends to 1 peer");
 
 static int keepalive = 100;
 CFS_MODULE_PARM(keepalive, "i", int, 0644,
@@ -69,11 +69,11 @@ CFS_MODULE_PARM(keepalive, "i", int, 0644,
 
 kib_tunables_t kibnal_tunables = {
         .kib_ipif_basename          = &ipif_basename,
-       .kib_n_connd                = &n_connd,
+        .kib_n_connd                = &n_connd,
         .kib_min_reconnect_interval = &min_reconnect_interval,
         .kib_max_reconnect_interval = &max_reconnect_interval,
         .kib_concurrent_peers       = &concurrent_peers,
-       .kib_cksum                  = &cksum,
+        .kib_cksum                  = &cksum,
         .kib_timeout                = &timeout,
         .kib_ntx                    = &ntx,
         .kib_credits                = &credits,
@@ -83,54 +83,127 @@ kib_tunables_t kibnal_tunables = {
 
 #if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
 
-static ctl_table kibnal_ctl_table[] = {
-       {1, "ipif_basename", &ipif_basename, 
-         1024, 0444, NULL, &proc_dostring},
-       {2, "n_connd", &n_connd, 
-        sizeof(int), 0444, NULL, &proc_dointvec},
-       {3, "min_reconnect_interval", &min_reconnect_interval, 
-        sizeof(int), 0644, NULL, &proc_dointvec},
-       {4, "max_reconnect_interval", &max_reconnect_interval, 
-        sizeof(int), 0644, NULL, &proc_dointvec},
-       {5, "concurrent_peers", &concurrent_peers, 
-        sizeof(int), 0444, NULL, &proc_dointvec},
-       {6, "cksum", &cksum, 
-        sizeof(int), 0644, NULL, &proc_dointvec},
-       {7, "timeout", &timeout, 
-        sizeof(int), 0644, NULL, &proc_dointvec},
-       {8, "ntx", &ntx, 
-        sizeof(int), 0444, NULL, &proc_dointvec},
-       {9, "credits", &credits, 
-        sizeof(int), 0444, NULL, &proc_dointvec},
-       {10, "peer_credits", &peer_credits, 
-        sizeof(int), 0444, NULL, &proc_dointvec},
-       {11, "keepalive", &keepalive, 
-        sizeof(int), 0644, NULL, &proc_dointvec},
-       {0}
+static cfs_sysctl_table_t kibnal_ctl_table[] = {
+        {
+                .ctl_name = 1,
+                .procname = "ipif_basename",
+                .data     = &ipif_basename,
+                .maxlen   = 1024,
+                .mode     = 0444,
+                .proc_handler = &proc_dostring
+        },
+        {
+                .ctl_name = 2,
+                .procname = "n_connd",
+                .data     = &n_connd,
+                .maxlen   = sizeof(int),
+                .mode     = 0444,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = 3,
+                .procname = "min_reconnect_interval",
+                .data     = &min_reconnect_interval,
+                .maxlen   = sizeof(int),
+                .mode     = 0644,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = 4,
+                .procname = "max_reconnect_interval",
+                .data     = &max_reconnect_interval,
+                .maxlen   = sizeof(int),
+                .mode     = 0644,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = 5,
+                .procname = "concurrent_peers",
+                .data     = &concurrent_peers,
+                .maxlen   = sizeof(int),
+                .mode     = 0444,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = 6,
+                .procname = "cksum",
+                .data     = &cksum,
+                .maxlen   = sizeof(int),
+                .mode     = 0644,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = 7,
+                .procname = "timeout",
+                .data     = &timeout,
+                .maxlen   = sizeof(int),
+                .mode     = 0644,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = 8,
+                .procname = "ntx",
+                .data     = &ntx,
+                .maxlen   = sizeof(int),
+                .mode     = 0444,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = 9,
+                .procname = "credits",
+                .data     = &credits,
+                .maxlen   = sizeof(int),
+                .mode     = 0444,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = 10,
+                .procname = "peer_credits",
+                .data     = &peer_credits,
+                .maxlen   = sizeof(int),
+                .mode     = 0444,
+                .proc_handler = &proc_dointvec
+        },
+        {
+                .ctl_name = 11,
+                .procname = "keepalive",
+                .data     = &keepalive,
+                .maxlen   = sizeof(int),
+                .mode     = 0644,
+                .proc_handler = &proc_dointvec
+        },
+        {0}
 };
 
-static ctl_table kibnal_top_ctl_table[] = {
-       {203, "openibnal", NULL, 0, 0555, kibnal_ctl_table},
-       {0}
+static cfs_sysctl_table_t kibnal_top_ctl_table[] = {
+        {
+                .ctl_name = 203,
+                .procname = "openibnal",
+                .data     = NULL,
+                .maxlen   = 0,
+                .mode     = 0555,
+                .child    = kibnal_ctl_table
+        },
+        {0}
 };
 
 int
 kibnal_tunables_init ()
 {
-       kibnal_tunables.kib_sysctl =
-               cfs_register_sysctl_table(kibnal_top_ctl_table, 0);
-       
-       if (kibnal_tunables.kib_sysctl == NULL)
-               CWARN("Can't setup /proc tunables\n");
+        kibnal_tunables.kib_sysctl =
+                cfs_register_sysctl_table(kibnal_top_ctl_table, 0);
 
-       return 0;
+        if (kibnal_tunables.kib_sysctl == NULL)
+                CWARN("Can't setup /proc tunables\n");
+
+        return 0;
 }
 
 void
 kibnal_tunables_fini ()
 {
-       if (kibnal_tunables.kib_sysctl != NULL)
-               cfs_unregister_sysctl_table(kibnal_tunables.kib_sysctl);
+        if (kibnal_tunables.kib_sysctl != NULL)
+                cfs_unregister_sysctl_table(kibnal_tunables.kib_sysctl);
 }
 
 #else
@@ -138,7 +211,7 @@ kibnal_tunables_fini ()
 int
 kibnal_tunables_init ()
 {
-       return 0;
+        return 0;
 }
 
 void