From: James Simmons <uja.ornl@gmail.com>
Date: Wed, 27 Apr 2011 12:32:19 +0000 (-0400)
Subject: LU-244 Cray portals compile fixes for Lustre 2.X
X-Git-Tag: 2.0.62.0~19
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=80841afa3eea4dce8fce6a6b5728f8f129a0abc5

LU-244 Cray portals compile fixes for Lustre 2.X

While moving the lustre client on cray sea star systems I ran it the
compile issues with the portals klnd driver. The reason being is the
lag of the driver to the api changes in the lnet layer. This patch
brings the lnet portals driver up to date.

Change-Id: I9e81cc11e25be7c5c548fdfd3cc7e596107fc0ef
Signed-off-by:James Simmons <uja.ornl@gmail.com>
Reviewed-on: http://review.whamcloud.com/469
Reviewed-by: Liang Zhen <liang@whamcloud.com>
Reviewed-by: Cory Spitz <spitzcor@cray.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: Hudson
---

diff --git a/lnet/klnds/ptllnd/ptllnd.c b/lnet/klnds/ptllnd/ptllnd.c
index d773de6..717dd47 100755
--- a/lnet/klnds/ptllnd/ptllnd.c
+++ b/lnet/klnds/ptllnd/ptllnd.c
@@ -574,8 +574,8 @@ kptllnd_base_shutdown (void)
                 i = 2;
                 while (cfs_atomic_read (&kptllnd_data.kptl_nthreads) != 0) {
                         /* Wake up all threads*/
-                        cfs_wake_up_all(&kptllnd_data.kptl_sched_waitq);
-                        cfs_wake_up_all(&kptllnd_data.kptl_watchdog_waitq);
+                        cfs_waitq_broadcast(&kptllnd_data.kptl_sched_waitq);
+                        cfs_waitq_broadcast(&kptllnd_data.kptl_watchdog_waitq);
 
                         i++;
                         CDEBUG(((i & (-i)) == i) ? D_WARNING : D_NET, /* power of 2? */
@@ -679,7 +679,7 @@ kptllnd_base_startup (void)
 
         /* Setup the sched locks/lists/waitq */
         cfs_spin_lock_init(&kptllnd_data.kptl_sched_lock);
-        cfs_init_waitqueue_head(&kptllnd_data.kptl_sched_waitq);
+        cfs_waitq_init(&kptllnd_data.kptl_sched_waitq);
         CFS_INIT_LIST_HEAD(&kptllnd_data.kptl_sched_txq);
         CFS_INIT_LIST_HEAD(&kptllnd_data.kptl_sched_rxq);
         CFS_INIT_LIST_HEAD(&kptllnd_data.kptl_sched_rxbq);
@@ -774,7 +774,7 @@ kptllnd_base_startup (void)
         kptllnd_data.kptl_nak_msg->ptlm_srcstamp = kptllnd_data.kptl_incarnation;
 
         cfs_rwlock_init(&kptllnd_data.kptl_peer_rw_lock);
-        cfs_init_waitqueue_head(&kptllnd_data.kptl_watchdog_waitq);
+        cfs_waitq_init(&kptllnd_data.kptl_watchdog_waitq);
         cfs_atomic_set(&kptllnd_data.kptl_needs_ptltrace, 0);
         CFS_INIT_LIST_HEAD(&kptllnd_data.kptl_closing_peers);
         CFS_INIT_LIST_HEAD(&kptllnd_data.kptl_zombie_peers);