LU-1346 libcfs: cleanup libcfs primitive (linux-prim.h)

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

diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c
index 8783fe7..54e1b27 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.c
+++ b/lnet/klnds/socklnd/socklnd.c
@@ -102,18 +102,18 @@ ksocknal_destroy_route (ksock_route_t *route)
 int
 ksocknal_create_peer (ksock_peer_t **peerp, lnet_ni_t *ni, lnet_process_id_t id)
 {
-        ksock_net_t   *net = ni->ni_data;
-        ksock_peer_t  *peer;
+       ksock_net_t   *net = ni->ni_data;
+       ksock_peer_t  *peer;
 
-        LASSERT (id.nid != LNET_NID_ANY);
-        LASSERT (id.pid != LNET_PID_ANY);
-        LASSERT (!cfs_in_interrupt());
+       LASSERT (id.nid != LNET_NID_ANY);
+       LASSERT (id.pid != LNET_PID_ANY);
+       LASSERT (!in_interrupt());
 
-        LIBCFS_ALLOC (peer, sizeof (*peer));
-        if (peer == NULL)
-                return -ENOMEM;
+       LIBCFS_ALLOC (peer, sizeof (*peer));
+       if (peer == NULL)
+               return -ENOMEM;
 
-        memset (peer, 0, sizeof (*peer));       /* NULL pointers/clear flags etc */
+       memset (peer, 0, sizeof (*peer));       /* NULL pointers/clear flags etc */
 
         peer->ksnp_ni = ni;
         peer->ksnp_id = id;
@@ -1266,16 +1266,16 @@ ksocknal_create_conn (lnet_ni_t *ni, ksock_route_t *route,
         sched->kss_nconns++;
         conn->ksnc_scheduler = sched;
 
-        conn->ksnc_tx_last_post = cfs_time_current();
-        /* Set the deadline for the outgoing HELLO to drain */
-        conn->ksnc_tx_bufnob = libcfs_sock_wmem_queued(sock);
-        conn->ksnc_tx_deadline = cfs_time_shift(*ksocknal_tunables.ksnd_timeout);
-        cfs_mb();   /* order with adding to peer's conn list */
+       conn->ksnc_tx_last_post = cfs_time_current();
+       /* Set the deadline for the outgoing HELLO to drain */
+       conn->ksnc_tx_bufnob = libcfs_sock_wmem_queued(sock);
+       conn->ksnc_tx_deadline = cfs_time_shift(*ksocknal_tunables.ksnd_timeout);
+       smp_mb();   /* order with adding to peer's conn list */
 
-        cfs_list_add (&conn->ksnc_list, &peer->ksnp_conns);
-        ksocknal_conn_addref(conn);
+       cfs_list_add (&conn->ksnc_list, &peer->ksnp_conns);
+       ksocknal_conn_addref(conn);
 
-        ksocknal_new_packet(conn, 0);
+       ksocknal_new_packet(conn, 0);
 
         conn->ksnc_zc_capable = ksocknal_lib_zc_capable(conn);