LU-14080 gnilnd: updates for SUSE 15 SP2

[fs/lustre-release.git] / lnet / klnds / gnilnd / gnilnd_sysctl.c

diff --git a/lnet/klnds/gnilnd/gnilnd_sysctl.c b/lnet/klnds/gnilnd/gnilnd_sysctl.c
index aa08d80..c95f8d6 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd_sysctl.c
+++ b/lnet/klnds/gnilnd/gnilnd_sysctl.c
@@ -133,8 +133,7 @@ proc_trigger_stack_reset(struct ctl_table *table, int write,
                i++;
                LCONSOLE((((i) & (-i)) == i) ? D_WARNING : D_NET,
                                "Waiting for stack reset request to clear\n");
-               set_current_state(TASK_UNINTERRUPTIBLE);
-               schedule_timeout(cfs_time_seconds(1 * i));
+               schedule_timeout_uninterruptible(cfs_time_seconds(i));
        }
 
        RETURN(rc);
@@ -236,7 +235,6 @@ static struct ctl_table kgnilnd_table[] = {
         * to go via /proc for portability.
         */
        {
-               INIT_CTL_NAME
                .procname = "version",
                .data     = LUSTRE_VERSION_STRING,
                .maxlen   = sizeof(LUSTRE_VERSION_STRING),
@@ -244,7 +242,6 @@ static struct ctl_table kgnilnd_table[] = {
                .proc_handler = &proc_dostring
        },
        {
-               INIT_CTL_NAME
                .procname = "thread_pause",
                .data     = &kgnilnd_sysctl.ksd_pause_trigger,
                .maxlen   = sizeof(int),
@@ -252,7 +249,6 @@ static struct ctl_table kgnilnd_table[] = {
                .proc_handler = &proc_toggle_thread_pause,
        },
        {
-               INIT_CTL_NAME
                .procname = "hw_quiesce",
                .data     = &kgnilnd_sysctl.ksd_quiesce_secs,
                .maxlen   = sizeof(__u32),
@@ -260,7 +256,6 @@ static struct ctl_table kgnilnd_table[] = {
                .proc_handler = &proc_hw_quiesce,
        },
        {
-               INIT_CTL_NAME
                .procname = "stack_reset",
                .data     = NULL,
                .maxlen   = sizeof(int),
@@ -268,7 +263,6 @@ static struct ctl_table kgnilnd_table[] = {
                .proc_handler = &proc_trigger_stack_reset,
        },
        {
-               INIT_CTL_NAME
                .procname = "rdmaq_override",
                .data     = &kgnilnd_sysctl.ksd_rdmaq_override,
                .maxlen   = sizeof(int),
@@ -276,26 +270,24 @@ static struct ctl_table kgnilnd_table[] = {
                .proc_handler = &proc_toggle_rdmaq_override,
        },
        {
-               INIT_CTL_NAME
                .procname = "peer_state",
                .data     = kgnilnd_sysctl.ksd_peer_state,
                .maxlen   = GNILND_PEERSTATE_STRLEN,
                .mode     = 0644,
                .proc_handler = &proc_peer_state,
        },
-       { 0 }
+       { .procname = NULL }
 };
 
 static struct ctl_table kgnilnd_top_table[2] = {
        {
-               INIT_CTL_NAME
                .procname = "kgnilnd",
                .data     = NULL,
                .maxlen   = 0,
                .mode     = 0555,
                .child    = kgnilnd_table
        },
-       { 0 }
+       { .procname = NULL }
 };
 
 void kgnilnd_insert_sysctl(void)