LU-9010 lnet: Change static defines to use macro for module.c

[fs/lustre-release.git] / lnet / lnet / module.c

diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c
index c080eb4..9b43c20 100644 (file)
--- a/lnet/lnet/module.c
+++ b/lnet/lnet/module.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2016, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -31,14 +31,15 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LNET
+
 #include <lnet/lib-lnet.h>
-#include <lnet/lib-dlc.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 struct mutex lnet_config_mutex;
+static DEFINE_MUTEX(lnet_config_mutex);
 
 static int
 lnet_configure(void *arg)
@@ -91,7 +92,7 @@ lnet_unconfigure (void)
 }
 
 static int
-lnet_dyn_configure(struct libcfs_ioctl_hdr *hdr)
+lnet_dyn_configure_net(struct libcfs_ioctl_hdr *hdr)
 {
        struct lnet_ioctl_config_data *conf =
          (struct lnet_ioctl_config_data *)hdr;
@@ -101,19 +102,17 @@ lnet_dyn_configure(struct libcfs_ioctl_hdr *hdr)
                return -EINVAL;
 
        mutex_lock(&lnet_config_mutex);
-       if (!the_lnet.ln_niinit_self) {
+       if (the_lnet.ln_niinit_self)
+               rc = lnet_dyn_add_net(conf);
+       else
                rc = -EINVAL;
-               goto out_unlock;
-       }
-       rc = lnet_dyn_add_ni(LNET_PID_LUSTRE, conf);
-out_unlock:
        mutex_unlock(&lnet_config_mutex);
 
        return rc;
 }
 
 static int
-lnet_dyn_unconfigure(struct libcfs_ioctl_hdr *hdr)
+lnet_dyn_unconfigure_net(struct libcfs_ioctl_hdr *hdr)
 {
        struct lnet_ioctl_config_data *conf =
          (struct lnet_ioctl_config_data *) hdr;
@@ -123,42 +122,95 @@ lnet_dyn_unconfigure(struct libcfs_ioctl_hdr *hdr)
                return -EINVAL;
 
        mutex_lock(&lnet_config_mutex);
-       if (!the_lnet.ln_niinit_self) {
+       if (the_lnet.ln_niinit_self)
+               rc = lnet_dyn_del_net(conf->cfg_net);
+       else
+               rc = -EINVAL;
+       mutex_unlock(&lnet_config_mutex);
+
+       return rc;
+}
+
+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;
+
+       if (conf->lic_cfg_hdr.ioc_len < sizeof(*conf))
+               return -EINVAL;
+
+       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);
+
+       return rc;
+}
+
+static int
+lnet_dyn_unconfigure_ni(struct libcfs_ioctl_hdr *hdr)
+{
+       struct lnet_ioctl_config_ni *conf =
+         (struct lnet_ioctl_config_ni *) hdr;
+       int                           rc;
+
+       if (conf->lic_cfg_hdr.ioc_len < sizeof(*conf))
+               return -EINVAL;
+
+       mutex_lock(&lnet_config_mutex);
+       if (the_lnet.ln_niinit_self)
+               rc = lnet_dyn_del_ni(conf);
+       else
                rc = -EINVAL;
-               goto out_unlock;
-       }
-       rc = lnet_dyn_del_ni(conf->cfg_net);
-out_unlock:
        mutex_unlock(&lnet_config_mutex);
 
        return rc;
 }
 
 static int
-lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr)
+lnet_ioctl(struct notifier_block *nb,
+          unsigned long cmd, void *vdata)
 {
-       int   rc;
+       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))
-                       return -EINVAL;
-
-               the_lnet.ln_nis_from_mod_params = data->ioc_flags;
-               return lnet_configure(NULL);
+               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:
-               return lnet_unconfigure();
+               rc = lnet_unconfigure();
+               break;
 
        case IOC_LIBCFS_ADD_NET:
-               return lnet_dyn_configure(hdr);
+               rc = lnet_dyn_configure_net(hdr);
+               break;
 
        case IOC_LIBCFS_DEL_NET:
-               return lnet_dyn_unconfigure(hdr);
+               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
@@ -169,26 +221,28 @@ lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr)
                        rc = LNetCtl(cmd, hdr);
                        LNetNIFini();
                }
-               return rc;
+               break;
        }
+       return notifier_from_ioctl_errno(rc);
 }
 
-DECLARE_IOCTL_HANDLER(lnet_ioctl_handler, lnet_ioctl);
+static struct notifier_block lnet_ioctl_handler = {
+       .notifier_call = lnet_ioctl,
+};
 
 static int __init lnet_init(void)
 {
        int rc;
        ENTRY;
 
-       mutex_init(&lnet_config_mutex);
-
        rc = lnet_lib_init();
        if (rc != 0) {
                CERROR("lnet_lib_init: error %d\n", rc);
                RETURN(rc);
        }
 
-       rc = libcfs_register_ioctl(&lnet_ioctl_handler);
+       rc = blocking_notifier_chain_register(&libcfs_ioctl_list,
+                                             &lnet_ioctl_handler);
        LASSERT(rc == 0);
 
        if (config_on_load) {
@@ -204,7 +258,8 @@ static void __exit lnet_exit(void)
 {
        int rc;
 
-       rc = libcfs_deregister_ioctl(&lnet_ioctl_handler);
+       rc = blocking_notifier_chain_unregister(&libcfs_ioctl_list,
+                                               &lnet_ioctl_handler);
        LASSERT(rc == 0);
 
        lnet_lib_exit();