Whamcloud - gitweb
LU-12678 socklnd: initialize the_ksocklnd at compile-time. 31/36831/5
authorMr NeilBrown <neilb@suse.de>
Wed, 15 Jan 2020 15:31:45 +0000 (10:31 -0500)
committerOleg Drokin <green@whamcloud.com>
Thu, 23 Jan 2020 05:31:31 +0000 (05:31 +0000)
All other lnds initialize this struct at compile-time.
It is best for socklnd to do so too.

Test-Parameters: trivial testlist=sanity-lnet

Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: I3acd636f6f5ba783a2c60bf18ffc46c98e091c13
Reviewed-on: https://review.whamcloud.com/36831
Reviewed-by: Serguei Smirnov <ssmirnov@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lnet/klnds/socklnd/socklnd.c

index 3357110..2393e01 100644 (file)
@@ -2797,6 +2797,18 @@ static void __exit ksocklnd_exit(void)
        lnet_unregister_lnd(&the_ksocklnd);
 }
 
+static struct lnet_lnd the_ksocklnd = {
+       .lnd_type               = SOCKLND,
+       .lnd_startup            = ksocknal_startup,
+       .lnd_shutdown           = ksocknal_shutdown,
+       .lnd_ctl                = ksocknal_ctl,
+       .lnd_send               = ksocknal_send,
+       .lnd_recv               = ksocknal_recv,
+       .lnd_notify_peer_down   = ksocknal_notify_gw_down,
+       .lnd_query              = ksocknal_query,
+       .lnd_accept             = ksocknal_accept,
+};
+
 static int __init ksocklnd_init(void)
 {
        int rc;
@@ -2805,17 +2817,6 @@ static int __init ksocklnd_init(void)
        BUILD_BUG_ON(SOCKLND_CONN_NTYPES > 4);
        BUILD_BUG_ON(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_peer_down   = ksocknal_notify_gw_down;
-       the_ksocklnd.lnd_query    = ksocknal_query;
-       the_ksocklnd.lnd_accept   = ksocknal_accept;
-
        rc = ksocknal_tunables_init();
        if (rc != 0)
                return rc;