Whamcloud - gitweb
LU-9010 lnet: Change static defines to use macro for module.c
[fs/lustre-release.git] / lnet / lnet / module.c
index 012d3d9..9b43c20 100644 (file)
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- * Copyright (C) 2001, 2002 Cluster File Systems, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2017, Intel Corporation.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-#define DEBUG_SUBSYSTEM S_PORTALS
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/stat.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/smp_lock.h>
-#include <linux/unistd.h>
-
-#include <asm/system.h>
-#include <asm/uaccess.h>
-
-#include <linux/fs.h>
-#include <linux/stat.h>
-#include <asm/uaccess.h>
-#include <asm/segment.h>
-#include <linux/miscdevice.h>
-
-#include <portals/lib-p30.h>
-#include <portals/p30.h>
-#include <linux/kp30.h>
-#include <linux/kpr.h>
-#include <linux/portals_compat25.h>
-
-extern void (kping_client)(struct portal_ioctl_data *);
-
-struct nal_cmd_handler {
-        nal_cmd_handler_t nch_handler;
-        void * nch_private;
-};
+#define DEBUG_SUBSYSTEM S_LNET
 
-static struct nal_cmd_handler nal_cmd[NAL_MAX_NR + 1];
-static DECLARE_MUTEX(nal_cmd_sem);
+#include <lnet/lib-lnet.h>
+#include <uapi/linux/lnet/lnet-dlc.h>
 
+static int config_on_load = 0;
+module_param(config_on_load, int, 0444);
+MODULE_PARM_DESC(config_on_load, "configure network at module load");
+
+static DEFINE_MUTEX(lnet_config_mutex);
 
 static int
-kportal_add_route(int gateway_nalid, ptl_nid_t gateway_nid, 
-                  ptl_nid_t lo_nid, ptl_nid_t hi_nid)
+lnet_configure(void *arg)
 {
-        int rc;
-        kpr_control_interface_t *ci;
+       /* 'arg' only there so I can be passed to cfs_create_thread() */
+       int    rc = 0;
+
+       mutex_lock(&lnet_config_mutex);
 
-        ci = (kpr_control_interface_t *) PORTAL_SYMBOL_GET (kpr_control_interface);
-        if (ci == NULL)
-                return (-ENODEV);
+       if (!the_lnet.ln_niinit_self) {
+               rc = try_module_get(THIS_MODULE);
 
-        rc = ci->kprci_add_route (gateway_nalid, gateway_nid, lo_nid, hi_nid);
+               if (rc != 1)
+                       goto out;
 
-        PORTAL_SYMBOL_PUT(kpr_control_interface);
-        return (rc);
+               rc = LNetNIInit(LNET_PID_LUSTRE);
+               if (rc >= 0) {
+                       the_lnet.ln_niinit_self = 1;
+                       rc = 0;
+               } else {
+                       module_put(THIS_MODULE);
+               }
+       }
+
+out:
+       mutex_unlock(&lnet_config_mutex);
+       return rc;
 }
 
 static int
-kportal_del_route(int gw_nalid, ptl_nid_t gw_nid, 
-                  ptl_nid_t lo, ptl_nid_t hi)
+lnet_unconfigure (void)
 {
-        int rc;
-        kpr_control_interface_t *ci;
+       int   refcount;
+
+       mutex_lock(&lnet_config_mutex);
 
-        ci = (kpr_control_interface_t *)PORTAL_SYMBOL_GET(kpr_control_interface);
-        if (ci == NULL)
-                return (-ENODEV);
+       if (the_lnet.ln_niinit_self) {
+               the_lnet.ln_niinit_self = 0;
+               LNetNIFini();
+               module_put(THIS_MODULE);
+       }
 
-        rc = ci->kprci_del_route (gw_nalid, gw_nid, lo, hi);
+       mutex_lock(&the_lnet.ln_api_mutex);
+       refcount = the_lnet.ln_refcount;
+       mutex_unlock(&the_lnet.ln_api_mutex);
 
-        PORTAL_SYMBOL_PUT(kpr_control_interface);
-        return (rc);
+       mutex_unlock(&lnet_config_mutex);
+
+       return (refcount == 0) ? 0 : -EBUSY;
 }
 
 static int
-kportal_notify_router (int gw_nalid, ptl_nid_t gw_nid,
-                       int alive, time_t when)
+lnet_dyn_configure_net(struct libcfs_ioctl_hdr *hdr)
 {
-        int rc;
-        kpr_control_interface_t *ci;
+       struct lnet_ioctl_config_data *conf =
+         (struct lnet_ioctl_config_data *)hdr;
+       int                           rc;
 
-        /* No error if router not preset.  Sysadmin is allowed to notify
-         * _everywhere_ when a NID boots or crashes, even if they know
-         * nothing of the peer. */
-        ci = (kpr_control_interface_t *)PORTAL_SYMBOL_GET(kpr_control_interface);
-        if (ci == NULL)
-                return (0);
+       if (conf->cfg_hdr.ioc_len < sizeof(*conf))
+               return -EINVAL;
 
-        rc = ci->kprci_notify (gw_nalid, gw_nid, alive, when);
+       mutex_lock(&lnet_config_mutex);
+       if (the_lnet.ln_niinit_self)
+               rc = lnet_dyn_add_net(conf);
+       else
+               rc = -EINVAL;
+       mutex_unlock(&lnet_config_mutex);
 
-        PORTAL_SYMBOL_PUT(kpr_control_interface);
-        return (rc);
+       return rc;
 }
 
 static int
-kportal_get_route(int index, __u32 *gateway_nalidp, ptl_nid_t *gateway_nidp,
-                  ptl_nid_t *lo_nidp, ptl_nid_t *hi_nidp, int *alivep)
+lnet_dyn_unconfigure_net(struct libcfs_ioctl_hdr *hdr)
 {
-        int       gateway_nalid;
-        ptl_nid_t gateway_nid;
-        ptl_nid_t lo_nid;
-        ptl_nid_t hi_nid;
-        int       alive;
-        int       rc;
-        kpr_control_interface_t *ci;
-
-        ci = (kpr_control_interface_t *) PORTAL_SYMBOL_GET(kpr_control_interface);
-        if (ci == NULL)
-                return (-ENODEV);
-
-        rc = ci->kprci_get_route(index, &gateway_nalid, &gateway_nid,
-                                 &lo_nid, &hi_nid, &alive);
-
-        if (rc == 0) {
-                CDEBUG(D_IOCTL, "got route [%d] %d "LPX64":"LPX64" - "LPX64", %s\n",
-                       index, gateway_nalid, gateway_nid, lo_nid, hi_nid,
-                       alive ? "up" : "down");
-
-                *gateway_nalidp = (__u32)gateway_nalid;
-                *gateway_nidp   = gateway_nid;
-                *lo_nidp        = lo_nid;
-                *hi_nidp        = hi_nid;
-                *alivep         = alive;
-        }
-
-        PORTAL_SYMBOL_PUT (kpr_control_interface);
-        return (rc);
-}
+       struct lnet_ioctl_config_data *conf =
+         (struct lnet_ioctl_config_data *) hdr;
+       int                           rc;
 
-static int 
-kportal_router_cmd(struct portals_cfg *pcfg, void * private)
-{
-        int err = -EINVAL;
-        ENTRY;
-
-        switch(pcfg->pcfg_command) {
-        default:
-                CDEBUG(D_IOCTL, "Inappropriate cmd: %d\n", pcfg->pcfg_command);
-                break;
-                
-        case NAL_CMD_ADD_ROUTE:
-                CDEBUG(D_IOCTL, "Adding route: [%d] "LPU64" : "LPU64" - "LPU64"\n",
-                       pcfg->pcfg_nal, pcfg->pcfg_nid, 
-                       pcfg->pcfg_nid2, pcfg->pcfg_nid3);
-                err = kportal_add_route(pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
-                                        pcfg->pcfg_nid2, pcfg->pcfg_nid3);
-                break;
-
-        case NAL_CMD_DEL_ROUTE:
-                CDEBUG (D_IOCTL, "Removing routes via [%d] "LPU64" : "LPU64" - "LPU64"\n",
-                        pcfg->pcfg_gw_nal, pcfg->pcfg_nid, 
-                        pcfg->pcfg_nid2, pcfg->pcfg_nid3);
-                err = kportal_del_route (pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
-                                         pcfg->pcfg_nid2, pcfg->pcfg_nid3);
-                break;
-
-        case NAL_CMD_NOTIFY_ROUTER: {
-                CDEBUG (D_IOCTL, "Notifying peer [%d] "LPU64" %s @ %ld\n",
-                        pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
-                        pcfg->pcfg_flags ? "Enabling" : "Disabling",
-                        (time_t)pcfg->pcfg_nid3);
-                
-                err = kportal_notify_router (pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
-                                             pcfg->pcfg_flags, 
-                                             (time_t)pcfg->pcfg_nid3);
-                break;
-        }
-                
-        case NAL_CMD_GET_ROUTE:
-                CDEBUG (D_IOCTL, "Getting route [%d]\n", pcfg->pcfg_count);
-                err = kportal_get_route(pcfg->pcfg_count, &pcfg->pcfg_gw_nal,
-                                        &pcfg->pcfg_nid, 
-                                        &pcfg->pcfg_nid2, &pcfg->pcfg_nid3,
-                                        &pcfg->pcfg_flags);
-                break;
-        }
-        RETURN(err);
-}
+       if (conf->cfg_hdr.ioc_len < sizeof(*conf))
+               return -EINVAL;
 
-int
-kportal_nal_cmd(struct portals_cfg *pcfg)
-{
-        __u32 nal = pcfg->pcfg_nal;
-        int rc = -EINVAL;
-
-        ENTRY;
-
-        down(&nal_cmd_sem);
-        if (nal > 0 && nal <= NAL_MAX_NR && nal_cmd[nal].nch_handler) {
-                CDEBUG(D_IOCTL, "calling handler nal: %d, cmd: %d\n", nal, 
-                       pcfg->pcfg_command);
-                rc = nal_cmd[nal].nch_handler(pcfg, nal_cmd[nal].nch_private);
-        }
-        up(&nal_cmd_sem);
-        RETURN(rc);
+       mutex_lock(&lnet_config_mutex);
+       if (the_lnet.ln_niinit_self)
+               rc = lnet_dyn_del_net(conf->cfg_net);
+       else
+               rc = -EINVAL;
+       mutex_unlock(&lnet_config_mutex);
+
+       return rc;
 }
 
-ptl_handle_ni_t *
-kportal_get_ni (int nal)
+static int
+lnet_dyn_configure_ni(struct libcfs_ioctl_hdr *hdr)
 {
+       struct lnet_ioctl_config_ni *conf =
+         (struct lnet_ioctl_config_ni *)hdr;
+       int                           rc;
 
-        switch (nal)
-        {
-        case QSWNAL:
-                return (PORTAL_SYMBOL_GET(kqswnal_ni));
-        case SOCKNAL:
-                return (PORTAL_SYMBOL_GET(ksocknal_ni));
-        case GMNAL:
-                return  (PORTAL_SYMBOL_GET(kgmnal_ni));
-        case IBNAL:
-                return  (PORTAL_SYMBOL_GET(kibnal_ni));
-        case TCPNAL:
-                /* userspace NAL */
-                return (NULL);
-        case SCIMACNAL:
-                return  (PORTAL_SYMBOL_GET(kscimacnal_ni));
-        default:
-                /* A warning to a naive caller */
-                CERROR ("unknown nal: %d\n", nal);
-                return (NULL);
-        }
-}
+       if (conf->lic_cfg_hdr.ioc_len < sizeof(*conf))
+               return -EINVAL;
 
-void
-kportal_put_ni (int nal)
-{
+       mutex_lock(&lnet_config_mutex);
+       if (the_lnet.ln_niinit_self)
+               rc = lnet_dyn_add_ni(conf);
+       else
+               rc = -EINVAL;
+       mutex_unlock(&lnet_config_mutex);
 
-        switch (nal)
-        {
-        case QSWNAL:
-                PORTAL_SYMBOL_PUT(kqswnal_ni);
-                break;
-        case SOCKNAL:
-                PORTAL_SYMBOL_PUT(ksocknal_ni);
-                break;
-        case GMNAL:
-                PORTAL_SYMBOL_PUT(kgmnal_ni);
-                break;
-        case IBNAL:
-                PORTAL_SYMBOL_PUT(kibnal_ni);
-                break;
-        case TCPNAL:
-                /* A lesson to a malicious caller */
-                LBUG ();
-        case SCIMACNAL:
-                PORTAL_SYMBOL_PUT(kscimacnal_ni);
-                break;
-        default:
-                CERROR ("unknown nal: %d\n", nal);
-        }
+       return rc;
 }
 
-int
-kportal_nal_register(int nal, nal_cmd_handler_t handler, void * private)
+static int
+lnet_dyn_unconfigure_ni(struct libcfs_ioctl_hdr *hdr)
 {
-        int rc = 0;
-
-        CDEBUG(D_IOCTL, "Register NAL %d, handler: %p\n", nal, handler);
-
-        if (nal > 0  && nal <= NAL_MAX_NR) {
-                down(&nal_cmd_sem);
-                if (nal_cmd[nal].nch_handler != NULL)
-                        rc = -EBUSY;
-                else {
-                        nal_cmd[nal].nch_handler = handler;
-                        nal_cmd[nal].nch_private = private;
-                }
-                up(&nal_cmd_sem);
-        }
-        return rc;
-}
+       struct lnet_ioctl_config_ni *conf =
+         (struct lnet_ioctl_config_ni *) hdr;
+       int                           rc;
 
-int
-kportal_nal_unregister(int nal)
-{
-        int rc = 0;
+       if (conf->lic_cfg_hdr.ioc_len < sizeof(*conf))
+               return -EINVAL;
 
-        CDEBUG(D_IOCTL, "Unregister NAL %d\n", nal);
+       mutex_lock(&lnet_config_mutex);
+       if (the_lnet.ln_niinit_self)
+               rc = lnet_dyn_del_ni(conf);
+       else
+               rc = -EINVAL;
+       mutex_unlock(&lnet_config_mutex);
 
-        if (nal > 0  && nal <= NAL_MAX_NR) {
-                down(&nal_cmd_sem);
-                nal_cmd[nal].nch_handler = NULL;
-                nal_cmd[nal].nch_private = NULL;
-                up(&nal_cmd_sem);
-        }
-        return rc;
+       return rc;
 }
 
-static int kportal_ioctl(struct portal_ioctl_data *data, 
-                         unsigned int cmd, unsigned long arg)
+static int
+lnet_ioctl(struct notifier_block *nb,
+          unsigned long cmd, void *vdata)
 {
-        int err = 0;
-        char str[PTL_NALFMT_SIZE];
-        ENTRY;
-
-        switch (cmd) {
-        case IOC_PORTAL_PING: {
-                void (*ping)(struct portal_ioctl_data *);
-
-                CDEBUG(D_IOCTL, "doing %d pings to nid "LPX64" (%s)\n",
-                       data->ioc_count, data->ioc_nid,
-                       portals_nid2str(data->ioc_nal, data->ioc_nid, str));
-                ping = PORTAL_SYMBOL_GET(kping_client);
-                if (!ping)
-                        CERROR("PORTAL_SYMBOL_GET failed\n");
-                else {
-                        ping(data);
-                        PORTAL_SYMBOL_PUT(kping_client);
-                }
-                RETURN(0);
-        }
-
-        case IOC_PORTAL_GET_NID: {
-                const ptl_handle_ni_t *nip;
-                ptl_process_id_t       pid;
-
-                CDEBUG (D_IOCTL, "Getting nid for nal [%d]\n", data->ioc_nal);
-
-                nip = kportal_get_ni (data->ioc_nal);
-                if (nip == NULL)
-                        RETURN (-EINVAL);
-
-                err = PtlGetId (*nip, &pid);
-                LASSERT (err == PTL_OK);
-                kportal_put_ni (data->ioc_nal);
-
-                data->ioc_nid = pid.nid;
-                if (copy_to_user ((char *)arg, data, sizeof (*data)))
-                        err = -EFAULT;
-                break;
-        }
-
-        case IOC_PORTAL_NAL_CMD: {
-                struct portals_cfg pcfg;
-
-                LASSERT (data->ioc_plen1 == sizeof(pcfg));
-                err = copy_from_user(&pcfg, (void *)data->ioc_pbuf1, 
-                                     sizeof(pcfg));
-                if ( err ) {
-                        EXIT;
-                        return err;
-                }
-
-                CDEBUG (D_IOCTL, "nal command nal %d cmd %d\n", pcfg.pcfg_nal,
-                        pcfg.pcfg_command);
-                err = kportal_nal_cmd(&pcfg);
-                if (err == 0) {
-                        if (copy_to_user((char *)data->ioc_pbuf1, &pcfg, 
-                                         sizeof (pcfg)))
-                                err = -EFAULT;
-                        if (copy_to_user((char *)arg, data, sizeof (*data)))
-                                err = -EFAULT;
-                }
-                break;
-        }
-        case IOC_PORTAL_FAIL_NID: {
-                const ptl_handle_ni_t *nip;
-
-                CDEBUG (D_IOCTL, "fail nid: [%d] "LPU64" count %d\n",
-                        data->ioc_nal, data->ioc_nid, data->ioc_count);
-
-                nip = kportal_get_ni (data->ioc_nal);
-                if (nip == NULL)
-                        return (-EINVAL);
-
-                err = PtlFailNid (*nip, data->ioc_nid, data->ioc_count);
-                kportal_put_ni (data->ioc_nal);
-                break;
-        }
-        default:
-                err = -EINVAL;
-                break;
-        }
-
-        RETURN(err);
+       struct libcfs_ioctl_hdr *hdr = vdata;
+       int rc;
+
+       switch (cmd) {
+       case IOC_LIBCFS_CONFIGURE: {
+               struct libcfs_ioctl_data *data =
+                 (struct libcfs_ioctl_data *)hdr;
+
+               if (data->ioc_hdr.ioc_len < sizeof(*data)) {
+                       rc = -EINVAL;
+               } else {
+                       the_lnet.ln_nis_from_mod_params = data->ioc_flags;
+                       rc = lnet_configure(NULL);
+               }
+               break;
+       }
+
+       case IOC_LIBCFS_UNCONFIGURE:
+               rc = lnet_unconfigure();
+               break;
+
+       case IOC_LIBCFS_ADD_NET:
+               rc = lnet_dyn_configure_net(hdr);
+               break;
+
+       case IOC_LIBCFS_DEL_NET:
+               rc = lnet_dyn_unconfigure_net(hdr);
+               break;
+
+       case IOC_LIBCFS_ADD_LOCAL_NI:
+               rc = lnet_dyn_configure_ni(hdr);
+               break;
+
+       case IOC_LIBCFS_DEL_LOCAL_NI:
+               rc = lnet_dyn_unconfigure_ni(hdr);
+               break;
+
+       default:
+               /* Passing LNET_PID_ANY only gives me a ref if the net is up
+                * already; I'll need it to ensure the net can't go down while
+                * I'm called into it */
+               rc = LNetNIInit(LNET_PID_ANY);
+               if (rc >= 0) {
+                       rc = LNetCtl(cmd, hdr);
+                       LNetNIFini();
+               }
+               break;
+       }
+       return notifier_from_ioctl_errno(rc);
 }
 
-DECLARE_IOCTL_HANDLER(kportal_ioctl_handler, kportal_ioctl);
+static struct notifier_block lnet_ioctl_handler = {
+       .notifier_call = lnet_ioctl,
+};
 
-static int init_kportals_module(void)
+static int __init lnet_init(void)
 {
-        int rc;
-        ENTRY;
-
-        rc = PtlInit(NULL);
-        if (rc) {
-                CERROR("PtlInit: error %d\n", rc);
-                RETURN(rc);
-        }
-
-        rc = kportal_nal_register(ROUTER, kportal_router_cmd, NULL);
-        if (rc) {
-                PtlFini();
-                CERROR("kportal_nal_registre: ROUTER error %d\n", rc);
-        }
-
-        if (rc == 0)
-                libcfs_register_ioctl(&kportal_ioctl_handler);
-
-        RETURN(rc);
+       int rc;
+       ENTRY;
+
+       rc = lnet_lib_init();
+       if (rc != 0) {
+               CERROR("lnet_lib_init: error %d\n", rc);
+               RETURN(rc);
+       }
+
+       rc = blocking_notifier_chain_register(&libcfs_ioctl_list,
+                                             &lnet_ioctl_handler);
+       LASSERT(rc == 0);
+
+       if (config_on_load) {
+               /* Have to schedule a separate thread to avoid deadlocking
+                * in modload */
+               (void)kthread_run(lnet_configure, NULL, "lnet_initd");
+       }
+
+       RETURN(0);
 }
 
-static void exit_kportals_module(void)
+static void __exit lnet_exit(void)
 {
-        libcfs_deregister_ioctl(&kportal_ioctl_handler);
-        kportal_nal_unregister(ROUTER);
-        PtlFini();
+       int rc;
+
+       rc = blocking_notifier_chain_unregister(&libcfs_ioctl_list,
+                                               &lnet_ioctl_handler);
+       LASSERT(rc == 0);
+
+       lnet_lib_exit();
 }
 
-EXPORT_SYMBOL(kportal_nal_register);
-EXPORT_SYMBOL(kportal_nal_unregister);
-EXPORT_SYMBOL(kportal_get_ni);
-EXPORT_SYMBOL(kportal_put_ni);
-EXPORT_SYMBOL(kportal_nal_cmd);
-
-EXPORT_SYMBOL(ptl_err_str);
-EXPORT_SYMBOL(lib_dispatch);
-EXPORT_SYMBOL(PtlMEAttach);
-EXPORT_SYMBOL(PtlMEInsert);
-EXPORT_SYMBOL(PtlMEUnlink);
-EXPORT_SYMBOL(PtlEQAlloc);
-EXPORT_SYMBOL(PtlMDAttach);
-EXPORT_SYMBOL(PtlMDUnlink);
-EXPORT_SYMBOL(PtlNIInit);
-EXPORT_SYMBOL(PtlNIFini);
-EXPORT_SYMBOL(PtlNIDebug);
-EXPORT_SYMBOL(PtlInit);
-EXPORT_SYMBOL(PtlFini);
-EXPORT_SYMBOL(PtlSnprintHandle);
-EXPORT_SYMBOL(PtlPut);
-EXPORT_SYMBOL(PtlGet);
-EXPORT_SYMBOL(PtlEQWait);
-EXPORT_SYMBOL(PtlEQFree);
-EXPORT_SYMBOL(PtlEQGet);
-EXPORT_SYMBOL(PtlGetId);
-EXPORT_SYMBOL(PtlMDBind);
-EXPORT_SYMBOL(lib_iov_nob);
-EXPORT_SYMBOL(lib_copy_iov2buf);
-EXPORT_SYMBOL(lib_copy_buf2iov);
-EXPORT_SYMBOL(lib_extract_iov);
-EXPORT_SYMBOL(lib_kiov_nob);
-EXPORT_SYMBOL(lib_copy_kiov2buf);
-EXPORT_SYMBOL(lib_copy_buf2kiov);
-EXPORT_SYMBOL(lib_extract_kiov);
-EXPORT_SYMBOL(lib_finalize);
-EXPORT_SYMBOL(lib_parse);
-EXPORT_SYMBOL(lib_create_reply_msg);
-EXPORT_SYMBOL(lib_init);
-EXPORT_SYMBOL(lib_fini);
-EXPORT_SYMBOL(dispatch_name);
-
-MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>");
-MODULE_DESCRIPTION("Portals v3.1");
+MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
+MODULE_DESCRIPTION("Lustre Networking layer");
+MODULE_VERSION(LNET_VERSION);
 MODULE_LICENSE("GPL");
-module_init(init_kportals_module);
-module_exit(exit_kportals_module);
+
+module_init(lnet_init);
+module_exit(lnet_exit);