LU-9679 modules: Use LIST_HEAD for declaring list_heads

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

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index 962f6c6..f7b39b7 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -1545,7 +1545,7 @@ int ksocknal_scheduler(void *arg)
                }
 
                if (!list_empty(&sched->kss_tx_conns)) {
-                       struct list_head zlist = LIST_HEAD_INIT(zlist);
+                       LIST_HEAD(zlist);
 
                        if (!list_empty(&sched->kss_zombie_noop_txs)) {
                                list_add(&zlist,
@@ -1933,7 +1933,7 @@ ksocknal_recv_hello(struct lnet_ni *ni, struct ksock_conn *conn,
 static int
 ksocknal_connect(struct ksock_route *route)
 {
-       struct list_head zombies = LIST_HEAD_INIT(zombies);
+       LIST_HEAD(zombies);
        struct ksock_peer_ni *peer_ni = route->ksnr_peer;
         int               type;
         int               wanted;
@@ -1994,11 +1994,12 @@ ksocknal_connect(struct ksock_route *route)
                         goto failed;
                 }
 
-                rc = lnet_connect(&sock, peer_ni->ksnp_id.nid,
-                                  route->ksnr_myipaddr,
-                                  route->ksnr_ipaddr, route->ksnr_port);
-                if (rc != 0)
-                        goto failed;
+               rc = lnet_connect(&sock, peer_ni->ksnp_id.nid,
+                                 route->ksnr_myipaddr,
+                                 route->ksnr_ipaddr, route->ksnr_port,
+                                 peer_ni->ksnp_ni->ni_net_ns);
+               if (rc != 0)
+                       goto failed;
 
                 rc = ksocknal_create_conn(peer_ni->ksnp_ni, route, sock, type);
                 if (rc < 0) {
@@ -2415,7 +2416,7 @@ static inline void
 ksocknal_flush_stale_txs(struct ksock_peer_ni *peer_ni)
 {
        struct ksock_tx *tx;
-       struct list_head stale_txs = LIST_HEAD_INIT(stale_txs);
+       LIST_HEAD(stale_txs);
 
        write_lock_bh(&ksocknal_data.ksnd_global_lock);