LU-6245 libcfs: remove prim wrappers for libcfs

[fs/lustre-release.git] / lnet / klnds / o2iblnd / o2iblnd_cb.c

diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c
index 41a4ca5..0c946c4 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -3158,9 +3158,9 @@ kiblnd_connd (void *arg)
        int                peer_index = 0;
        unsigned long      deadline = jiffies;
 
-       cfs_block_allsigs ();
+       cfs_block_allsigs();
 
-       init_waitqueue_entry_current (&wait);
+       init_waitqueue_entry(&wait, current);
        kiblnd_data.kib_connd = current;
 
        spin_lock_irqsave(&kiblnd_data.kib_connd_lock, flags);
@@ -3241,7 +3241,7 @@ kiblnd_connd (void *arg)
                add_wait_queue(&kiblnd_data.kib_connd_waitq, &wait);
                spin_unlock_irqrestore(&kiblnd_data.kib_connd_lock, flags);
 
-               waitq_timedwait(&wait, TASK_INTERRUPTIBLE, timeout);
+               schedule_timeout(timeout);
 
                set_current_state(TASK_RUNNING);
                remove_wait_queue(&kiblnd_data.kib_connd_waitq, &wait);
@@ -3357,7 +3357,7 @@ kiblnd_scheduler(void *arg)
 
        cfs_block_allsigs();
 
-       init_waitqueue_entry_current(&wait);
+       init_waitqueue_entry(&wait, current);
 
        sched = kiblnd_data.kib_scheds[KIB_THREAD_CPT(id)];
 
@@ -3456,7 +3456,7 @@ kiblnd_scheduler(void *arg)
                add_wait_queue_exclusive(&sched->ibs_waitq, &wait);
                spin_unlock_irqrestore(&sched->ibs_lock, flags);
 
-               waitq_wait(&wait, TASK_INTERRUPTIBLE);
+               schedule();
                busy_loops = 0;
 
                remove_wait_queue(&sched->ibs_waitq, &wait);
@@ -3474,16 +3474,16 @@ int
 kiblnd_failover_thread(void *arg)
 {
        rwlock_t                *glock = &kiblnd_data.kib_global_lock;
-       kib_dev_t         *dev;
-       wait_queue_t     wait;
-       unsigned long      flags;
-       int                rc;
+       kib_dev_t               *dev;
+       wait_queue_t            wait;
+       unsigned long           flags;
+       int                     rc;
 
-       LASSERT (*kiblnd_tunables.kib_dev_failover != 0);
+       LASSERT(*kiblnd_tunables.kib_dev_failover != 0);
 
-       cfs_block_allsigs ();
+       cfs_block_allsigs();
 
-       init_waitqueue_entry_current(&wait);
+       init_waitqueue_entry(&wait, current);
        write_lock_irqsave(glock, flags);
 
         while (!kiblnd_data.kib_shutdown) {