LU-12678 lnet: use init_wait() rather than init_waitqueue_entry()

init_waitqueue_entry(foo, current)

is equivalent to

  init_wait(foo)

 So use the shorter version.

Change-Id: Ic63e99d75986211d9655a89f56721394c7b3abb6
Signed-off-by: Mr. NeilBrown <neilb@suse.de>
Reviewed-on: https://review.whamcloud.com/39295
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Chris Horn <chris.horn@hpe.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c
index 6bf2b24..6036756 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -3488,7 +3488,7 @@ kiblnd_connd (void *arg)
        int                peer_index = 0;
        unsigned long      deadline = jiffies;
 
        int                peer_index = 0;
        unsigned long      deadline = jiffies;
 

-       init_waitqueue_entry(&wait, current);
+       init_wait(&wait);

        kiblnd_data.kib_connd = current;
 
        spin_lock_irqsave(lock, flags);
        kiblnd_data.kib_connd = current;
 
        spin_lock_irqsave(lock, flags);


@@ -3769,7 +3769,7 @@ kiblnd_scheduler(void *arg)
        int                     did_something;
        int                     rc;
 
        int                     did_something;
        int                     rc;
 

-       init_waitqueue_entry(&wait, current);
+       init_wait(&wait);

 
        sched = kiblnd_data.kib_scheds[KIB_THREAD_CPT(id)];
 
 
        sched = kiblnd_data.kib_scheds[KIB_THREAD_CPT(id)];
 


@@ -3907,7 +3907,7 @@ kiblnd_failover_thread(void *arg)
 
        LASSERT(*kiblnd_tunables.kib_dev_failover != 0);
 
 
        LASSERT(*kiblnd_tunables.kib_dev_failover != 0);
 

-       init_waitqueue_entry(&wait, current);
+       init_wait(&wait);

        write_lock_irqsave(glock, flags);
 
         while (!kiblnd_data.kib_shutdown) {
        write_lock_irqsave(glock, flags);
 
         while (!kiblnd_data.kib_shutdown) {

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index 1ba4f14..0097815 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -2189,7 +2189,7 @@ ksocknal_connd(void *arg)
        wait_queue_entry_t wait;
        int cons_retry = 0;
 
        wait_queue_entry_t wait;
        int cons_retry = 0;
 

-       init_waitqueue_entry(&wait, current);
+       init_wait(&wait);

 
        spin_lock_bh(connd_lock);
 
 
        spin_lock_bh(connd_lock);
 


@@ -2566,7 +2566,7 @@ int ksocknal_reaper(void *arg)
        int peer_index = 0;
        time64_t deadline = ktime_get_seconds();
 
        int peer_index = 0;
        time64_t deadline = ktime_get_seconds();
 

-       init_waitqueue_entry(&wait, current);
+       init_wait(&wait);

 
        spin_lock_bh(&ksocknal_data.ksnd_reaper_lock);
 
 
        spin_lock_bh(&ksocknal_data.ksnd_reaper_lock);