b=20997 stop ost first in conf-sanity

[fs/lustre-release.git] / lnet / lnet / lib-eq.c

diff --git a/lnet/lnet/lib-eq.c b/lnet/lnet/lib-eq.c
index 701352c..4eb8aab 100644 (file)
--- a/lnet/lnet/lib-eq.c
+++ b/lnet/lnet/lib-eq.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -91,7 +91,7 @@ LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback,
         LNET_LOCK();
 
         lnet_initialise_handle (&eq->eq_lh, LNET_COOKIE_TYPE_EQ);
-        list_add (&eq->eq_list, &the_lnet.ln_active_eqs);
+        cfs_list_add (&eq->eq_list, &the_lnet.ln_active_eqs);
 
         LNET_UNLOCK();
 
@@ -129,7 +129,7 @@ LNetEQFree(lnet_handle_eq_t eqh)
         size    = eq->eq_size;
 
         lnet_invalidate_handle (&eq->eq_lh);
-        list_del (&eq->eq_list);
+        cfs_list_del (&eq->eq_list);
         lnet_eq_free (eq);
 
         LNET_UNLOCK();
@@ -203,7 +203,7 @@ LNetEQPoll (lnet_handle_eq_t *eventqs, int neq, int timeout_ms,
 #else
         struct timeval   then;
         struct timeval   now;
-# ifdef HAVE_LIBPTHREAD
+# ifdef HAVE_PTHREAD
         struct timespec  ts;
 # endif
         lnet_ni_t       *eqwaitni = the_lnet.ln_eqwaitni;
@@ -252,7 +252,7 @@ LNetEQPoll (lnet_handle_eq_t *eventqs, int neq, int timeout_ms,
                 }
 
                 cfs_waitlink_init(&wl);
-                set_current_state(TASK_INTERRUPTIBLE);
+                cfs_set_current_state(CFS_TASK_INTERRUPTIBLE);
                 cfs_waitq_add(&the_lnet.ln_waitq, &wl);
 
                 LNET_UNLOCK();
@@ -311,7 +311,7 @@ LNetEQPoll (lnet_handle_eq_t *eventqs, int neq, int timeout_ms,
                         RETURN (0);
                 }
 
-# ifndef HAVE_LIBPTHREAD
+# ifndef HAVE_PTHREAD
                 /* If I'm single-threaded, LNET fails at startup if it can't
                  * set the_lnet.ln_eqwaitni correctly.  */
                 LBUG();