LU-6142 socklnd: change UAPI typedefs to proper structure

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

diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c
index 69fb232..f3a5dfd 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.c
+++ b/lnet/klnds/socklnd/socklnd.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -1026,7 +1022,7 @@ ksocknal_create_conn(lnet_ni_t *ni, ksock_route_t *route,
         ksock_peer_t      *peer = NULL;
         ksock_peer_t      *peer2;
         ksock_sched_t     *sched;
-        ksock_hello_msg_t *hello;
+       struct ksock_hello_msg *hello;
        int                cpt;
         ksock_tx_t        *tx;
         ksock_tx_t        *txtmp;
@@ -1044,8 +1040,6 @@ ksocknal_create_conn(lnet_ni_t *ni, ksock_route_t *route,
                 goto failed_0;
         }
 
-        memset (conn, 0, sizeof (*conn));
-
         conn->ksnc_peer = NULL;
         conn->ksnc_route = NULL;
         conn->ksnc_sock = sock;
@@ -1065,7 +1059,7 @@ ksocknal_create_conn(lnet_ni_t *ni, ksock_route_t *route,
        conn->ksnc_tx_carrier = NULL;
        atomic_set (&conn->ksnc_tx_nob, 0);
 
-       LIBCFS_ALLOC(hello, offsetof(ksock_hello_msg_t,
+       LIBCFS_ALLOC(hello, offsetof(struct ksock_hello_msg,
                                     kshm_ips[LNET_MAX_INTERFACES]));
         if (hello == NULL) {
                 rc = -ENOMEM;
@@ -1314,7 +1308,7 @@ ksocknal_create_conn(lnet_ni_t *ni, ksock_route_t *route,
                 rc = ksocknal_send_hello(ni, conn, peerid.nid, hello);
         }
 
-        LIBCFS_FREE(hello, offsetof(ksock_hello_msg_t,
+       LIBCFS_FREE(hello, offsetof(struct ksock_hello_msg,
                                     kshm_ips[LNET_MAX_INTERFACES]));
 
         /* setup the socket AFTER I've received hello (it disables
@@ -1390,10 +1384,10 @@ failed_2:
         ksocknal_txlist_done(ni, &zombies, 1);
         ksocknal_peer_decref(peer);
 
- failed_1:
-        if (hello != NULL)
-                LIBCFS_FREE(hello, offsetof(ksock_hello_msg_t,
-                                            kshm_ips[LNET_MAX_INTERFACES]));
+failed_1:
+       if (hello != NULL)
+               LIBCFS_FREE(hello, offsetof(struct ksock_hello_msg,
+                                           kshm_ips[LNET_MAX_INTERFACES]));
 
        LIBCFS_FREE(conn, sizeof(*conn));
 
@@ -1441,11 +1435,6 @@ ksocknal_close_conn_locked (ksock_conn_t *conn, int error)
 
                conn->ksnc_route = NULL;
 
-#if 0          /* irrelevent with only eager routes */
-               /* make route least favourite */
-               list_del(&route->ksnr_list);
-               list_add_tail(&route->ksnr_list, &peer->ksnp_routes);
-#endif
                ksocknal_route_decref(route);   /* drop conn's ref on route */
        }
 
@@ -2476,7 +2465,7 @@ ksocknal_base_startup(void)
 
                snprintf(name, sizeof(name), "socknal_cd%02d", i);
                rc = ksocknal_thread_start(ksocknal_connd,
-                                          (void *)((ulong_ptr_t)i), name);
+                                          (void *)((uintptr_t)i), name);
                if (rc != 0) {
                        spin_lock_bh(&ksocknal_data.ksnd_connd_lock);
                        ksocknal_data.ksnd_connd_starting--;
@@ -2526,7 +2515,7 @@ ksocknal_debug_peerhash (lnet_ni_t *ni)
                 ksock_conn_t  *conn;
 
                CWARN ("Active peer on shutdown: %s, ref %d, scnt %d, "
-                      "closing %d, accepting %d, err %d, zcookie "LPU64", "
+                      "closing %d, accepting %d, err %d, zcookie %llu, "
                       "txq %d, zc_req %d\n", libcfs_id2str(peer->ksnp_id),
                       atomic_read(&peer->ksnp_refcount),
                       peer->ksnp_sharecount, peer->ksnp_closing,
@@ -2865,46 +2854,43 @@ ksocknal_startup (lnet_ni_t *ni)
 }
 
 
-static void __exit
-ksocknal_module_fini (void)
+static void __exit ksocklnd_exit(void)
 {
-        lnet_unregister_lnd(&the_ksocklnd);
-        ksocknal_tunables_fini();
+       lnet_unregister_lnd(&the_ksocklnd);
 }
 
-static int __init
-ksocknal_module_init (void)
+static int __init ksocklnd_init(void)
 {
-        int    rc;
-
-        /* check ksnr_connected/connecting field large enough */
-        CLASSERT (SOCKLND_CONN_NTYPES <= 4);
-        CLASSERT (SOCKLND_CONN_ACK == SOCKLND_CONN_BULK_IN);
-
-        /* initialize the_ksocklnd */
-        the_ksocklnd.lnd_type     = SOCKLND;
-        the_ksocklnd.lnd_startup  = ksocknal_startup;
-        the_ksocklnd.lnd_shutdown = ksocknal_shutdown;
-        the_ksocklnd.lnd_ctl      = ksocknal_ctl;
-        the_ksocklnd.lnd_send     = ksocknal_send;
-        the_ksocklnd.lnd_recv     = ksocknal_recv;
-        the_ksocklnd.lnd_notify   = ksocknal_notify;
-        the_ksocklnd.lnd_query    = ksocknal_query;
-        the_ksocklnd.lnd_accept   = ksocknal_accept;
-
-        rc = ksocknal_tunables_init();
-        if (rc != 0)
-                return rc;
+       int rc;
+
+       /* check ksnr_connected/connecting field large enough */
+       CLASSERT(SOCKLND_CONN_NTYPES <= 4);
+       CLASSERT(SOCKLND_CONN_ACK == SOCKLND_CONN_BULK_IN);
+
+       /* initialize the_ksocklnd */
+       the_ksocklnd.lnd_type     = SOCKLND;
+       the_ksocklnd.lnd_startup  = ksocknal_startup;
+       the_ksocklnd.lnd_shutdown = ksocknal_shutdown;
+       the_ksocklnd.lnd_ctl      = ksocknal_ctl;
+       the_ksocklnd.lnd_send     = ksocknal_send;
+       the_ksocklnd.lnd_recv     = ksocknal_recv;
+       the_ksocklnd.lnd_notify   = ksocknal_notify;
+       the_ksocklnd.lnd_query    = ksocknal_query;
+       the_ksocklnd.lnd_accept   = ksocknal_accept;
+
+       rc = ksocknal_tunables_init();
+       if (rc != 0)
+               return rc;
 
-        lnet_register_lnd(&the_ksocklnd);
+       lnet_register_lnd(&the_ksocklnd);
 
-        return 0;
+       return 0;
 }
 
 MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("Kernel TCP Socket LND v3.0.0");
-MODULE_VERSION("3.0.0");
+MODULE_DESCRIPTION("TCP Socket LNet Network Driver");
+MODULE_VERSION("2.8.0");
 MODULE_LICENSE("GPL");
 
-module_init(ksocknal_module_init);
-module_exit(ksocknal_module_fini);
+module_init(ksocklnd_init);
+module_exit(ksocklnd_exit);