LU-2675 lmv: remove lmv_init_{lock,unlock}()

[fs/lustre-release.git] / lnet / ulnds / socklnd / poll.c

diff --git a/lnet/ulnds/socklnd/poll.c b/lnet/ulnds/socklnd/poll.c
index 5206514..254abbe 100644 (file)
--- a/lnet/ulnds/socklnd/poll.c
+++ b/lnet/ulnds/socklnd/poll.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -45,12 +45,12 @@
 void
 usocklnd_process_stale_list(usock_pollthread_t *pt_data)
 {
-        while (!cfs_list_empty(&pt_data->upt_stale_list)) {
+       while (!list_empty(&pt_data->upt_stale_list)) {
                 usock_conn_t *conn;
-                conn = cfs_list_entry(pt_data->upt_stale_list.next,
+               conn = list_entry(pt_data->upt_stale_list.next,
                                       usock_conn_t, uc_stale_list);
 
-                cfs_list_del(&conn->uc_stale_list);
+               list_del(&conn->uc_stale_list);
 
                 usocklnd_tear_peer_conn(conn);
                 usocklnd_conn_decref(conn); /* -1 for idx2conn[idx] or pr */
@@ -90,12 +90,12 @@ usocklnd_poll_thread(void *arg)
 
                 /* Process all enqueued poll requests */
                 pthread_mutex_lock(&pt_data->upt_pollrequests_lock);
-                while (!cfs_list_empty(&pt_data->upt_pollrequests)) {
+               while (!list_empty(&pt_data->upt_pollrequests)) {
                         usock_pollrequest_t *pr;
-                        pr = cfs_list_entry(pt_data->upt_pollrequests.next,
+                       pr = list_entry(pt_data->upt_pollrequests.next,
                                             usock_pollrequest_t, upr_list);
 
-                        cfs_list_del(&pr->upr_list);
+                       list_del(&pr->upr_list);
                         rc = usocklnd_process_pollrequest(pr, pt_data);
                         if (rc)
                                 break;
@@ -171,16 +171,16 @@ usocklnd_poll_thread(void *arg)
                 /* Block new poll requests to be enqueued */
                 pt_data->upt_errno = rc;
 
-                while (!cfs_list_empty(&pt_data->upt_pollrequests)) {
+               while (!list_empty(&pt_data->upt_pollrequests)) {
                         usock_pollrequest_t *pr;
-                        pr = cfs_list_entry(pt_data->upt_pollrequests.next,
+                       pr = list_entry(pt_data->upt_pollrequests.next,
                                         usock_pollrequest_t, upr_list);
 
-                        cfs_list_del(&pr->upr_list);
+                       list_del(&pr->upr_list);
 
                         if (pr->upr_type == POLL_ADD_REQUEST) {
                                 libcfs_sock_release(pr->upr_conn->uc_sock);
-                                cfs_list_add_tail(&pr->upr_conn->uc_stale_list,
+                               list_add_tail(&pr->upr_conn->uc_stale_list,
                                                   &pt_data->upt_stale_list);
                         } else {
                                 usocklnd_conn_decref(pr->upr_conn);
@@ -201,10 +201,10 @@ usocklnd_poll_thread(void *arg)
                 }
         }
 
-        /* unblock usocklnd_shutdown() */
-        cfs_mt_complete(&pt_data->upt_completion);
+       /* unblock usocklnd_shutdown() */
+       complete(&pt_data->upt_completion);
 
-        return 0;
+       return 0;
 }
 
 /* Returns 0 on success, <0 else */
@@ -237,7 +237,7 @@ usocklnd_add_pollrequest(usock_conn_t *conn, int type, short value)
                 return rc;
         }
 
-        cfs_list_add_tail(&pr->upr_list, &pt->upt_pollrequests);
+       list_add_tail(&pr->upr_list, &pt->upt_pollrequests);
         pthread_mutex_unlock(&pt->upt_pollrequests_lock);
         return 0;
 }
@@ -266,7 +266,7 @@ usocklnd_add_killrequest(usock_conn_t *conn)
                         return; /* conn will be killed in poll thread anyway */
                 }
 
-                cfs_list_add_tail(&pr->upr_list, &pt->upt_pollrequests);
+               list_add_tail(&pr->upr_list, &pt->upt_pollrequests);
                 pthread_mutex_unlock(&pt->upt_pollrequests_lock);
 
                 conn->uc_preq = NULL;
@@ -387,7 +387,7 @@ usocklnd_process_pollrequest(usock_pollrequest_t *pr,
                 }
 
                 libcfs_sock_release(conn->uc_sock);
-                cfs_list_add_tail(&conn->uc_stale_list,
+               list_add_tail(&conn->uc_stale_list,
                                   &pt_data->upt_stale_list);
                 break;
         case POLL_RX_SET_REQUEST: