LU-2675 lnet: remove lnet/include/lnet/linux/

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

diff --git a/lnet/klnds/socklnd/socklnd_proto.c b/lnet/klnds/socklnd/socklnd_proto.c
index d4e1150..9bfb61a 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_proto.c
+++ b/lnet/klnds/socklnd/socklnd_proto.c
@@ -45,7 +45,7 @@ static ksock_tx_t *
 ksocknal_queue_tx_msg_v1(ksock_conn_t *conn, ksock_tx_t *tx_msg)
 {
         /* V1.x, just enqueue it */
-        cfs_list_add_tail(&tx_msg->tx_list, &conn->ksnc_tx_queue);
+       list_add_tail(&tx_msg->tx_list, &conn->ksnc_tx_queue);
         return NULL;
 }
 
@@ -55,17 +55,18 @@ ksocknal_next_tx_carrier(ksock_conn_t *conn)
         ksock_tx_t     *tx = conn->ksnc_tx_carrier;
 
         /* Called holding BH lock: conn->ksnc_scheduler->kss_lock */
-        LASSERT (!cfs_list_empty(&conn->ksnc_tx_queue));
-        LASSERT (tx != NULL);
+       LASSERT(!list_empty(&conn->ksnc_tx_queue));
+       LASSERT(tx != NULL);
 
         /* Next TX that can carry ZC-ACK or LNet message */
         if (tx->tx_list.next == &conn->ksnc_tx_queue) {
                 /* no more packets queued */
                 conn->ksnc_tx_carrier = NULL;
         } else {
-                conn->ksnc_tx_carrier = cfs_list_entry(tx->tx_list.next,
+               conn->ksnc_tx_carrier = list_entry(tx->tx_list.next,
                                                        ksock_tx_t, tx_list);
-                LASSERT (conn->ksnc_tx_carrier->tx_msg.ksm_type == tx->tx_msg.ksm_type);
+               LASSERT(conn->ksnc_tx_carrier->tx_msg.ksm_type ==
+                       tx->tx_msg.ksm_type);
         }
 }
 
@@ -87,7 +88,7 @@ ksocknal_queue_tx_zcack_v2(ksock_conn_t *conn,
          */
         if (tx == NULL) {
                 if (tx_ack != NULL) {
-                        cfs_list_add_tail(&tx_ack->tx_list,
+                       list_add_tail(&tx_ack->tx_list,
                                           &conn->ksnc_tx_queue);
                         conn->ksnc_tx_carrier = tx_ack;
                 }
@@ -97,7 +98,7 @@ ksocknal_queue_tx_zcack_v2(ksock_conn_t *conn,
         if (tx->tx_msg.ksm_type == KSOCK_MSG_NOOP) {
                 /* tx is noop zc-ack, can't piggyback zc-ack cookie */
                 if (tx_ack != NULL)
-                        cfs_list_add_tail(&tx_ack->tx_list,
+                       list_add_tail(&tx_ack->tx_list,
                                           &conn->ksnc_tx_queue);
                 return 0;
         }
@@ -129,13 +130,13 @@ ksocknal_queue_tx_msg_v2(ksock_conn_t *conn, ksock_tx_t *tx_msg)
          *   and replace the NOOP tx, and return the NOOP tx.
          */
         if (tx == NULL) { /* nothing on queue */
-                cfs_list_add_tail(&tx_msg->tx_list, &conn->ksnc_tx_queue);
+               list_add_tail(&tx_msg->tx_list, &conn->ksnc_tx_queue);
                 conn->ksnc_tx_carrier = tx_msg;
                 return NULL;
         }
 
         if (tx->tx_msg.ksm_type == KSOCK_MSG_LNET) { /* nothing to carry */
-                cfs_list_add_tail(&tx_msg->tx_list, &conn->ksnc_tx_queue);
+               list_add_tail(&tx_msg->tx_list, &conn->ksnc_tx_queue);
                 return NULL;
         }
 
@@ -146,8 +147,8 @@ ksocknal_queue_tx_msg_v2(ksock_conn_t *conn, ksock_tx_t *tx_msg)
         ksocknal_next_tx_carrier(conn);
 
         /* use new_tx to replace the noop zc-ack packet */
-        cfs_list_add(&tx_msg->tx_list, &tx->tx_list);
-        cfs_list_del(&tx->tx_list);
+       list_add(&tx_msg->tx_list, &tx->tx_list);
+       list_del(&tx->tx_list);
 
         return tx;
 }
@@ -167,7 +168,7 @@ ksocknal_queue_tx_zcack_v3(ksock_conn_t *conn,
 
         if ((tx = conn->ksnc_tx_carrier) == NULL) {
                 if (tx_ack != NULL) {
-                        cfs_list_add_tail(&tx_ack->tx_list,
+                       list_add_tail(&tx_ack->tx_list,
                                           &conn->ksnc_tx_queue);
                         conn->ksnc_tx_carrier = tx_ack;
                 }
@@ -261,7 +262,7 @@ ksocknal_queue_tx_zcack_v3(ksock_conn_t *conn,
 
         /* failed to piggyback ZC-ACK */
         if (tx_ack != NULL) {
-                cfs_list_add_tail(&tx_ack->tx_list, &conn->ksnc_tx_queue);
+               list_add_tail(&tx_ack->tx_list, &conn->ksnc_tx_queue);
                 /* the next tx can piggyback at least 1 ACK */
                 ksocknal_next_tx_carrier(conn);
         }
@@ -406,7 +407,7 @@ ksocknal_handle_zcack(ksock_conn_t *conn, __u64 cookie1, __u64 cookie2)
         ksock_peer_t      *peer = conn->ksnc_peer;
         ksock_tx_t        *tx;
         ksock_tx_t        *tmp;
-        CFS_LIST_HEAD     (zlist);
+       struct list_head        zlist = LIST_HEAD_INIT(zlist);
         int                count;
 
         if (cookie1 == 0)
@@ -422,14 +423,14 @@ ksocknal_handle_zcack(ksock_conn_t *conn, __u64 cookie1, __u64 cookie2)
 
        spin_lock(&peer->ksnp_lock);
 
-        cfs_list_for_each_entry_safe(tx, tmp,
+       list_for_each_entry_safe(tx, tmp,
                                      &peer->ksnp_zc_req_list, tx_zc_list) {
                 __u64 c = tx->tx_msg.ksm_zc_cookies[0];
 
                 if (c == cookie1 || c == cookie2 || (cookie1 < c && c < cookie2)) {
                         tx->tx_msg.ksm_zc_cookies[0] = 0;
-                        cfs_list_del(&tx->tx_zc_list);
-                        cfs_list_add(&tx->tx_zc_list, &zlist);
+                       list_del(&tx->tx_zc_list);
+                       list_add(&tx->tx_zc_list, &zlist);
 
                         if (--count == 0)
                                 break;
@@ -438,9 +439,9 @@ ksocknal_handle_zcack(ksock_conn_t *conn, __u64 cookie1, __u64 cookie2)
 
        spin_unlock(&peer->ksnp_lock);
 
-        while (!cfs_list_empty(&zlist)) {
-                tx = cfs_list_entry(zlist.next, ksock_tx_t, tx_zc_list);
-                cfs_list_del(&tx->tx_zc_list);
+       while (!list_empty(&zlist)) {
+               tx = list_entry(zlist.next, ksock_tx_t, tx_zc_list);
+               list_del(&tx->tx_zc_list);
                 ksocknal_tx_decref(tx);
         }