LU-13276 lnet: Update nnis to avoid infinite loop

[fs/lustre-release.git] / lnet / lnet / api-ni.c

diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c
index bb5fc97..f8310e4 100644 (file)
--- a/lnet/lnet/api-ni.c
+++ b/lnet/lnet/api-ni.c
@@ -548,7 +548,6 @@ lnet_init_locks(void)
 {
        spin_lock_init(&the_lnet.ln_eq_wait_lock);
        spin_lock_init(&the_lnet.ln_msg_resend_lock);
-       init_waitqueue_head(&the_lnet.ln_eq_waitq);
        init_completion(&the_lnet.ln_mt_wait_complete);
        mutex_init(&the_lnet.ln_lnd_mutex);
 }
@@ -1679,7 +1678,7 @@ lnet_ping_target_setup(struct lnet_ping_buffer **ppbuf,
 
        if (set_eq) {
                the_lnet.ln_ping_target_eq =
-                       LNetEQAlloc(0, lnet_ping_target_event_handler);
+                       LNetEQAlloc(lnet_ping_target_event_handler);
                if (IS_ERR(the_lnet.ln_ping_target_eq)) {
                        rc = PTR_ERR(the_lnet.ln_ping_target_eq);
                        CERROR("Can't allocate ping buffer EQ: %d\n", rc);
@@ -1855,14 +1854,16 @@ int lnet_push_target_resize(void)
        struct lnet_handle_md old_mdh;
        struct lnet_ping_buffer *pbuf;
        struct lnet_ping_buffer *old_pbuf;
-       int nnis = the_lnet.ln_push_target_nnis;
+       int nnis;
        int rc;
 
+again:
+       nnis = the_lnet.ln_push_target_nnis;
        if (nnis <= 0) {
                rc = -EINVAL;
                goto fail_return;
        }
-again:
+
        pbuf = lnet_ping_buffer_alloc(nnis, GFP_NOFS);
        if (!pbuf) {
                rc = -ENOMEM;
@@ -1945,7 +1946,7 @@ static int lnet_push_target_init(void)
                return -EALREADY;
 
        the_lnet.ln_push_target_eq =
-               LNetEQAlloc(0, lnet_push_target_event_handler);
+               LNetEQAlloc(lnet_push_target_event_handler);
        if (IS_ERR(the_lnet.ln_push_target_eq)) {
                rc = PTR_ERR(the_lnet.ln_push_target_eq);
                CERROR("Can't allocated push target EQ: %d\n", rc);
@@ -2646,7 +2647,7 @@ LNetNIInit(lnet_pid_t requested_pid)
 
        lnet_ping_target_update(pbuf, ping_mdh);
 
-       the_lnet.ln_mt_eq = LNetEQAlloc(0, lnet_mt_event_handler);
+       the_lnet.ln_mt_eq = LNetEQAlloc(lnet_mt_event_handler);
        if (IS_ERR(the_lnet.ln_mt_eq)) {
                rc = PTR_ERR(the_lnet.ln_mt_eq);
                CERROR("Can't allocate monitor thread EQ: %d\n", rc);
@@ -4135,7 +4136,7 @@ static int lnet_ping(struct lnet_process_id id, signed long timeout,
        if (!pbuf)
                return -ENOMEM;
 
-       eq = LNetEQAlloc(0, lnet_ping_event_handler);
+       eq = LNetEQAlloc(lnet_ping_event_handler);
        if (IS_ERR(eq)) {
                rc = PTR_ERR(eq);
                CERROR("Can't allocate EQ: %d\n", rc);