LU-12678 socklnd: use need_resched()

[fs/lustre-release.git] / lnet / klnds / socklnd / socklnd_cb.c

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index aa9f747..a7441fa 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -1446,7 +1446,6 @@ int ksocknal_scheduler(void *arg)
        struct ksock_conn *conn;
        struct ksock_tx *tx;
        int rc;
-       int nloops = 0;
        long id = (long)arg;
        struct page **rx_scratch_pgs;
        struct kvec *scratch_iov;
@@ -1592,12 +1591,10 @@ int ksocknal_scheduler(void *arg)
 
                        did_something = 1;
                }
-               if (!did_something ||           /* nothing to do */
-                   ++nloops == SOCKNAL_RESCHED) { /* hogging CPU? */
+               if (!did_something ||   /* nothing to do */
+                   need_resched()) {   /* hogging CPU? */
                        spin_unlock_bh(&sched->kss_lock);
 
-                       nloops = 0;
-
                        if (!did_something) {   /* wait for something to do */
                                rc = wait_event_interruptible_exclusive(
                                        sched->kss_waitq,
@@ -2196,7 +2193,6 @@ ksocknal_connd(void *arg)
        spinlock_t *connd_lock = &ksocknal_data.ksnd_connd_lock;
        struct ksock_connreq *cr;
        wait_queue_entry_t wait;
-       int nloops = 0;
        int cons_retry = 0;
 
        init_waitqueue_entry(&wait, current);
@@ -2273,10 +2269,9 @@ ksocknal_connd(void *arg)
                }
 
                if (dropped_lock) {
-                       if (++nloops < SOCKNAL_RESCHED)
+                       if (!need_resched())
                                continue;
                        spin_unlock_bh(connd_lock);
-                       nloops = 0;
                        cond_resched();
                        spin_lock_bh(connd_lock);
                        continue;
@@ -2287,7 +2282,6 @@ ksocknal_connd(void *arg)
                add_wait_queue_exclusive(&ksocknal_data.ksnd_connd_waitq, &wait);
                spin_unlock_bh(connd_lock);
 
-               nloops = 0;
                schedule_timeout(timeout);
 
                remove_wait_queue(&ksocknal_data.ksnd_connd_waitq, &wait);