LU-3963 libcfs: convert LNET layer to linux list api

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

diff --git a/lnet/ulnds/socklnd/usocklnd.c b/lnet/ulnds/socklnd/usocklnd.c
index 17f546c..717c3ef 100644 (file)
--- a/lnet/ulnds/socklnd/usocklnd.c
+++ b/lnet/ulnds/socklnd/usocklnd.c
@@ -283,15 +283,15 @@ usocklnd_base_startup()
                 pt->upt_idx2conn[0] = NULL;
 
                 pt->upt_errno = 0;
-                CFS_INIT_LIST_HEAD (&pt->upt_pollrequests);
-                CFS_INIT_LIST_HEAD (&pt->upt_stale_list);
+               INIT_LIST_HEAD(&pt->upt_pollrequests);
+               INIT_LIST_HEAD(&pt->upt_stale_list);
                 pthread_mutex_init(&pt->upt_pollrequests_lock, NULL);
                init_completion(&pt->upt_completion);
         }
 
         /* Initialize peer hash list */
         for (i = 0; i < UD_PEER_HASH_SIZE; i++)
-                CFS_INIT_LIST_HEAD(&usock_data.ud_peers[i]);
+               INIT_LIST_HEAD(&usock_data.ud_peers[i]);
 
         pthread_rwlock_init(&usock_data.ud_peers_lock, NULL);
 
@@ -518,16 +518,16 @@ usocklnd_shutdown(lnet_ni_t *ni)
 void
 usocklnd_del_all_peers(lnet_ni_t *ni)
 {
-        cfs_list_t        *ptmp;
-        cfs_list_t        *pnxt;
+       struct list_head        *ptmp;
+       struct list_head        *pnxt;
         usock_peer_t      *peer;
         int                i;
 
         pthread_rwlock_wrlock(&usock_data.ud_peers_lock);
 
         for (i = 0; i < UD_PEER_HASH_SIZE; i++) {
-                cfs_list_for_each_safe (ptmp, pnxt, &usock_data.ud_peers[i]) {
-                        peer = cfs_list_entry (ptmp, usock_peer_t, up_list);
+               list_for_each_safe(ptmp, pnxt, &usock_data.ud_peers[i]) {
+                       peer = list_entry(ptmp, usock_peer_t, up_list);
 
                         if (peer->up_ni != ni)
                                 continue;
@@ -554,7 +554,7 @@ usocklnd_del_peer_and_conns(usock_peer_t *peer)
         pthread_mutex_unlock(&peer->up_lock);
 
         /* peer hash list is still protected by the caller */
-        cfs_list_del(&peer->up_list);
+       list_del(&peer->up_list);
 
         usocklnd_peer_decref(peer); /* peer isn't in hash list anymore */
 }