X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Fmodule.c;h=3547a3b22d1f75860d10cd6a57c513c1d9e0eee8;hp=49366be275d6184bc650dc9f241ff40b5f4aaaf8;hb=726b556c6c42ac79399a4e1dab4f667547f96051;hpb=adf2e9d9ab987b46fa0269038f348cf2a17fd0e0

diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c
index 49366be..3547a3b 100644
--- a/lnet/lnet/module.c
+++ b/lnet/lnet/module.c
@@ -45,23 +45,23 @@ CFS_MODULE_PARM(config_on_load, "i", int, 0444,
 static struct mutex lnet_config_mutex;
 
 int
-lnet_configure (void *arg)
+lnet_configure(void *arg)
 {
-        /* 'arg' only there so I can be passed to cfs_create_thread() */
-        int    rc = 0;
+	/* 'arg' only there so I can be passed to cfs_create_thread() */
+	int    rc = 0;
 
-        LNET_MUTEX_LOCK(&lnet_config_mutex);
+	LNET_MUTEX_LOCK(&lnet_config_mutex);
 
-        if (!the_lnet.ln_niinit_self) {
-                rc = LNetNIInit(LUSTRE_SRV_LNET_PID);
-                if (rc >= 0) {
-                        the_lnet.ln_niinit_self = 1;
-                        rc = 0;
-                }
-        }
+	if (!the_lnet.ln_niinit_self) {
+		rc = LNetNIInit(LUSTRE_SRV_LNET_PID);
+		if (rc >= 0) {
+			the_lnet.ln_niinit_self = 1;
+			rc = 0;
+		}
+	}
 
-        LNET_MUTEX_UNLOCK(&lnet_config_mutex);
-        return rc;
+	LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+	return rc;
 }
 
 int
@@ -85,19 +85,68 @@ lnet_unconfigure (void)
 }
 
 int
+lnet_dyn_configure(struct libcfs_ioctl_hdr *hdr)
+{
+	struct lnet_ioctl_config_data *conf =
+	  (struct lnet_ioctl_config_data *)hdr;
+	int			      rc;
+
+	LNET_MUTEX_LOCK(&lnet_config_mutex);
+	if (the_lnet.ln_niinit_self)
+		rc = lnet_dyn_add_ni(LUSTRE_SRV_LNET_PID,
+				     conf->cfg_config_u.cfg_net.net_intf,
+				     conf->cfg_config_u.cfg_net.
+					net_peer_timeout,
+				     conf->cfg_config_u.cfg_net.
+					net_peer_tx_credits,
+				     conf->cfg_config_u.cfg_net.
+					net_peer_rtr_credits,
+				     conf->cfg_config_u.cfg_net.
+					net_max_tx_credits);
+	else
+		rc = -EINVAL;
+	LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+	return rc;
+}
+
+int
+lnet_dyn_unconfigure(struct libcfs_ioctl_hdr *hdr)
+{
+	struct lnet_ioctl_config_data *conf =
+	  (struct lnet_ioctl_config_data *) hdr;
+	int			      rc;
+
+	LNET_MUTEX_LOCK(&lnet_config_mutex);
+	if (the_lnet.ln_niinit_self)
+		rc = lnet_dyn_del_ni(conf->cfg_net);
+	else
+		rc = -EINVAL;
+	LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+
+	return rc;
+}
+
+int
 lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr)
 {
 	int   rc;
 
 	switch (cmd) {
-	case IOC_LIBCFS_CONFIGURE:
+	case IOC_LIBCFS_CONFIGURE: {
+		struct libcfs_ioctl_data *data =
+		  (struct libcfs_ioctl_data *)hdr;
+		the_lnet.ln_nis_from_mod_params = data->ioc_flags;
 		return lnet_configure(NULL);
+	}
 
 	case IOC_LIBCFS_UNCONFIGURE:
 		return lnet_unconfigure();
 
 	case IOC_LIBCFS_ADD_NET:
-		return LNetCtl(cmd, hdr);
+		return lnet_dyn_configure(hdr);
+
+	case IOC_LIBCFS_DEL_NET:
+		return lnet_dyn_unconfigure(hdr);
 
 	default:
 		/* Passing LNET_PID_ANY only gives me a ref if the net is up