LU-3651 mdt: upgrade 2.4.53 to 2.5.53 for rename lock

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

diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c
index 589bade..9d57479 100644 (file)
--- a/lnet/lnet/module.c
+++ b/lnet/lnet/module.c
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -39,7 +41,7 @@ static int config_on_load = 0;
 CFS_MODULE_PARM(config_on_load, "i", int, 0444,
                 "configure network at module load");
 
-static cfs_mutex_t lnet_config_mutex;
+static struct mutex lnet_config_mutex;
 
 int
 lnet_configure (void *arg)
@@ -114,7 +116,7 @@ init_lnet(void)
         int                  rc;
         ENTRY;
 
-        cfs_mutex_init(&lnet_config_mutex);
+       mutex_init(&lnet_config_mutex);
 
         rc = LNetInit();
         if (rc != 0) {
@@ -125,11 +127,11 @@ init_lnet(void)
         rc = libcfs_register_ioctl(&lnet_ioctl_handler);
         LASSERT (rc == 0);
 
-        if (config_on_load) {
-                /* Have to schedule a separate thread to avoid deadlocking
-                 * in modload */
-                (void) cfs_create_thread(lnet_configure, NULL, 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);
 }