LU-9679 modules: Use LIST_HEAD for declaring list_heads

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

diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c
index cb27e2b..6fd707c 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.c
+++ b/lnet/klnds/socklnd/socklnd.c
@@ -564,7 +564,7 @@ ksocknal_del_peer_locked(struct ksock_peer_ni *peer_ni, __u32 ip)
 static int
 ksocknal_del_peer(struct lnet_ni *ni, struct lnet_process_id id, __u32 ip)
 {
-       struct list_head zombies = LIST_HEAD_INIT(zombies);
+       LIST_HEAD(zombies);
        struct list_head *ptmp;
        struct list_head *pnxt;
        struct ksock_peer_ni *peer_ni;
@@ -1016,7 +1016,7 @@ ksocknal_create_conn(struct lnet_ni *ni, struct ksock_route *route,
                     struct socket *sock, int type)
 {
        rwlock_t *global_lock = &ksocknal_data.ksnd_global_lock;
-       struct list_head zombies = LIST_HEAD_INIT(zombies);
+       LIST_HEAD(zombies);
        struct lnet_process_id peerid;
        struct list_head *tmp;
        u64 incarnation;
@@ -1530,7 +1530,7 @@ ksocknal_finalize_zcreq(struct ksock_conn *conn)
        struct ksock_peer_ni *peer_ni = conn->ksnc_peer;
        struct ksock_tx *tx;
        struct ksock_tx *tmp;
-       struct list_head zlist = LIST_HEAD_INIT(zlist);
+       LIST_HEAD(zlist);
 
        /* NB safe to finalize TXs because closing of socket will
         * abort all buffered data */
@@ -1861,7 +1861,6 @@ ksocknal_query(struct lnet_ni *ni, lnet_nid_t nid, time64_t *when)
                 ksocknal_launch_all_connections_locked(peer_ni);
 
        write_unlock_bh(glock);
-        return;
 }
 
 static void
@@ -2469,49 +2468,49 @@ ksocknal_debug_peerhash(struct lnet_ni *ni)
 
        read_lock(&ksocknal_data.ksnd_global_lock);
 
-        for (i = 0; i < ksocknal_data.ksnd_peer_hash_size; i++) {
+       for (i = 0; i < ksocknal_data.ksnd_peer_hash_size; i++) {
                list_for_each(tmp, &ksocknal_data.ksnd_peers[i]) {
                        peer_ni = list_entry(tmp, struct ksock_peer_ni, ksnp_list);
 
-                        if (peer_ni->ksnp_ni == ni) break;
+                       if (peer_ni->ksnp_ni == ni)
+                               break;
 
-                        peer_ni = NULL;
-                }
-        }
+                       peer_ni = NULL;
+               }
+       }
 
         if (peer_ni != NULL) {
                struct ksock_route *route;
                struct ksock_conn  *conn;
 
-               CWARN ("Active peer_ni on shutdown: %s, ref %d, scnt %d, "
-                      "closing %d, accepting %d, err %d, zcookie %llu, "
-                      "txq %d, zc_req %d\n", libcfs_id2str(peer_ni->ksnp_id),
-                      atomic_read(&peer_ni->ksnp_refcount),
-                      peer_ni->ksnp_sharecount, peer_ni->ksnp_closing,
-                      peer_ni->ksnp_accepting, peer_ni->ksnp_error,
-                      peer_ni->ksnp_zc_next_cookie,
-                      !list_empty(&peer_ni->ksnp_tx_queue),
-                      !list_empty(&peer_ni->ksnp_zc_req_list));
+               CWARN("Active peer_ni on shutdown: %s, ref %d, "
+                     "closing %d, accepting %d, err %d, zcookie %llu, "
+                     "txq %d, zc_req %d\n", libcfs_id2str(peer_ni->ksnp_id),
+                     atomic_read(&peer_ni->ksnp_refcount),
+                     peer_ni->ksnp_closing,
+                     peer_ni->ksnp_accepting, peer_ni->ksnp_error,
+                     peer_ni->ksnp_zc_next_cookie,
+                     !list_empty(&peer_ni->ksnp_tx_queue),
+                     !list_empty(&peer_ni->ksnp_zc_req_list));
 
                list_for_each(tmp, &peer_ni->ksnp_routes) {
                        route = list_entry(tmp, struct ksock_route, ksnr_list);
-                       CWARN ("Route: ref %d, schd %d, conn %d, cnted %d, "
-                              "del %d\n", atomic_read(&route->ksnr_refcount),
-                              route->ksnr_scheduled, route->ksnr_connecting,
-                              route->ksnr_connected, route->ksnr_deleted);
+                       CWARN("Route: ref %d, schd %d, conn %d, cnted %d, "
+                             "del %d\n", atomic_read(&route->ksnr_refcount),
+                             route->ksnr_scheduled, route->ksnr_connecting,
+                             route->ksnr_connected, route->ksnr_deleted);
                }
 
                list_for_each(tmp, &peer_ni->ksnp_conns) {
                        conn = list_entry(tmp, struct ksock_conn, ksnc_list);
-                       CWARN ("Conn: ref %d, sref %d, t %d, c %d\n",
-                              atomic_read(&conn->ksnc_conn_refcount),
-                              atomic_read(&conn->ksnc_sock_refcount),
-                              conn->ksnc_type, conn->ksnc_closing);
+                       CWARN("Conn: ref %d, sref %d, t %d, c %d\n",
+                             atomic_read(&conn->ksnc_conn_refcount),
+                             atomic_read(&conn->ksnc_sock_refcount),
+                             conn->ksnc_type, conn->ksnc_closing);
                }
        }
 
        read_unlock(&ksocknal_data.ksnd_global_lock);
-       return;
 }
 
 void