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 = 256;
CFS_MODULE_PARM(ntx, "i", int, 0444,
- "# of message descriptors");
+ "# of message descriptors");
static int credits = 128;
CFS_MODULE_PARM(credits, "i", int, 0444,
- "# concurrent sends");
+ "# concurrent sends");
static int peer_credits = 8;
CFS_MODULE_PARM(peer_credits, "i", int, 0444,
- "# concurrent sends to 1 peer");
+ "# concurrent sends to 1 peer");
static int sd_retries = 8;
CFS_MODULE_PARM(sd_retries, "i", int, 0444,
- "# times to retry SD queries");
+ "# times to retry SD queries");
static int keepalive = 100;
CFS_MODULE_PARM(keepalive, "i", int, 0644,
.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_keepalive = &keepalive,
.kib_ntx = &ntx,
.kib_concurrent_sends = &concurrent_sends,
};
-#if CONFIG_SYSCTL && !CFS_SYSFS_MODULE_PARM
+#if defined(CONFIG_SYSCTL) && !CFS_SYSFS_MODULE_PARM
/* NB max_size specified for proc_dostring entries only needs to be big enough
* not to truncate the printout; it only needs to be the actual size of the
* string buffer if we allow writes (and we don't) */
-static ctl_table kibnal_ctl_table[] = {
- {1, "ipif_basename", &ipif_basename,
- 1024, 0444, NULL, &proc_dostring},
- {2, "service_name", &service_name,
- 1024, 0444, NULL, &proc_dostring},
- {3, "service_number", &service_number,
- sizeof(int), 0444, NULL, &proc_dointvec},
- {4, "min_reconnect_interval", &min_reconnect_interval,
- sizeof(int), 0644, NULL, &proc_dointvec},
- {5, "max_reconnect_interval", &max_reconnect_interval,
- sizeof(int), 0644, NULL, &proc_dointvec},
- {6, "concurrent_peers", &concurrent_peers,
- sizeof(int), 0444, NULL, &proc_dointvec},
- {7, "cksum", &cksum,
- sizeof(int), 0644, NULL, &proc_dointvec},
- {8, "timeout", &timeout,
- sizeof(int), 0644, NULL, &proc_dointvec},
- {9, "ntx", &ntx,
- sizeof(int), 0444, NULL, &proc_dointvec},
- {10, "credits", &credits,
- sizeof(int), 0444, NULL, &proc_dointvec},
- {11, "peer_credits", &peer_credits,
- sizeof(int), 0444, NULL, &proc_dointvec},
- {12, "sd_retries", &sd_retries,
- sizeof(int), 0444, NULL, &proc_dointvec},
- {13, "keepalive", &keepalive,
- sizeof(int), 0644, NULL, &proc_dointvec},
- {14, "concurrent_sends", &concurrent_sends,
- 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 = "service_name",
+ .data = &service_name,
+ .maxlen = 1024,
+ .mode = 0444,
+ .proc_handler = &proc_dostring
+ },
+ {
+ .ctl_name = 3,
+ .procname = "service_number",
+ .data = &service_number,
+ .maxlen = sizeof(int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = 4,
+ .procname = "min_reconnect_interval",
+ .data = &min_reconnect_interval,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = 5,
+ .procname = "max_reconnect_interval",
+ .data = &max_reconnect_interval,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = 6,
+ .procname = "concurrent_peers",
+ .data = &concurrent_peers,
+ .maxlen = sizeof(int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = 7,
+ .procname = "cksum",
+ .data = &cksum,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = 8,
+ .procname = "timeout",
+ .data = &timeout,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = 9,
+ .procname = "ntx",
+ .data = &ntx,
+ .maxlen = sizeof(int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = 10,
+ .procname = "credits",
+ .data = &credits,
+ .maxlen = sizeof(int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = 11,
+ .procname = "peer_credits",
+ .data = &peer_credits,
+ .maxlen = sizeof(int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = 12,
+ .procname = "sd_retries",
+ .data = &sd_retries,
+ .maxlen = sizeof(int),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = 13,
+ .procname = "keepalive",
+ .data = &keepalive,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = 14,
+ .procname = "concurrent_sends",
+ .data = &concurrent_sends,
+ .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 =
- 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);
+
+ if (kibnal_tunables.kib_sysctl == NULL)
+ CWARN("Can't setup /proc tunables\n");
if (*kibnal_tunables.kib_concurrent_sends > IBNAL_RX_MSGS)
*kibnal_tunables.kib_concurrent_sends = IBNAL_RX_MSGS;
if (*kibnal_tunables.kib_concurrent_sends < IBNAL_MSG_QUEUE_SIZE)
*kibnal_tunables.kib_concurrent_sends = IBNAL_MSG_QUEUE_SIZE;
- return 0;
+ return 0;
}
void
kibnal_tunables_fini ()
{
- if (kibnal_tunables.kib_sysctl != NULL)
- unregister_sysctl_table(kibnal_tunables.kib_sysctl);
+ if (kibnal_tunables.kib_sysctl != NULL)
+ cfs_unregister_sysctl_table(kibnal_tunables.kib_sysctl);
}
#else
int
kibnal_tunables_init ()
{
- return 0;
+ return 0;
}
void
git://git.whamcloud.com / fs / lustre-release.git / blobdiff