LU-8401 lnet: remove dependency on OFED headers from lnet

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

diff --git a/lnet/klnds/gnilnd/gnilnd_stack.c b/lnet/klnds/gnilnd/gnilnd_stack.c
index 819280b..6268f31 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd_stack.c
+++ b/lnet/klnds/gnilnd/gnilnd_stack.c
@@ -133,7 +133,8 @@ kgnilnd_quiesce_wait(char *reason)
                                 atomic_read(&kgnilnd_data.kgn_nthreads) -
                                 atomic_read(&kgnilnd_data.kgn_nquiesce));
                        CFS_RACE(CFS_FAIL_GNI_QUIESCE_RACE);
-                       cfs_pause(cfs_time_seconds(1 * i));
+                       set_current_state(TASK_UNINTERRUPTIBLE);
+                       schedule_timeout(cfs_time_seconds(1 * i));
 
                        LASSERTF(quiesce_deadline > jiffies,
                                 "couldn't quiesce threads in %lu seconds, falling over now\n",
@@ -158,7 +159,8 @@ kgnilnd_quiesce_wait(char *reason)
                                 "%s: Waiting for %d threads to wake up\n",
                                  reason,
                                  atomic_read(&kgnilnd_data.kgn_nquiesce));
-                       cfs_pause(cfs_time_seconds(1 * i));
+                       set_current_state(TASK_UNINTERRUPTIBLE);
+                       schedule_timeout(cfs_time_seconds(1 * i));
                }
 
                CDEBUG(D_INFO, "%s: All threads awake!\n", reason);
@@ -417,7 +419,8 @@ kgnilnd_ruhroh_thread(void *arg)
                                i++;
                                CDEBUG(D_INFO, "Waiting for hardware quiesce "
                                               "flag to clear\n");
-                               cfs_pause(cfs_time_seconds(1 * i));
+                               set_current_state(TASK_UNINTERRUPTIBLE);
+                               schedule_timeout(cfs_time_seconds(1 * i));
 
                                /* If we got a quiesce event with bump info, DO THE BUMP!. */
                                if (kgnilnd_data.kgn_bump_info_rdy) {
@@ -532,7 +535,7 @@ kgnilnd_quiesce_end_callback(gni_nic_handle_t nic_handle, uint64_t msecs)
 
        if (!kgnilnd_data.kgn_ruhroh_shutdown) {
 
-               CDEBUG(D_NET, "requesting timeout bump by "LPD64" msecs\n", msecs);
+               CDEBUG(D_NET, "requesting timeout bump by %lld msecs\n", msecs);
 
                /* Save the bump interval and request the bump.
                 * The memory barrier ensures that the interval is in place before