LU-13090 utils: fix lfs_migrate -p for file with pool

[fs/lustre-release.git] / libcfs / libcfs / debug.c

diff --git a/libcfs/libcfs/debug.c b/libcfs/libcfs/debug.c
index 3a0c289..2b30ab0 100644 (file)
--- a/libcfs/libcfs/debug.c
+++ b/libcfs/libcfs/debug.c
@@ -49,8 +49,8 @@ module_param(libcfs_subsystem_debug, int, 0644);
 MODULE_PARM_DESC(libcfs_subsystem_debug, "Lustre kernel debug subsystem mask");
 EXPORT_SYMBOL(libcfs_subsystem_debug);
 
-unsigned int libcfs_debug = (D_CANTMASK |
-                            D_NETERROR | D_HA | D_CONFIG | D_IOCTL | D_LFSCK);
+unsigned int libcfs_debug = (D_CANTMASK | D_NETERROR | D_HA | D_CONFIG |
+                            D_IOCTL | D_LFSCK | D_TTY);
 module_param(libcfs_debug, int, 0644);
 MODULE_PARM_DESC(libcfs_debug, "Lustre kernel debug mask");
 EXPORT_SYMBOL(libcfs_debug);
@@ -69,15 +69,8 @@ static int libcfs_param_debug_mb_set(const char *val,
  * RHEL6 does not support any kind of locking so we have to provide
  * our own
  */
-#if !defined(HAVE_MODULE_PARAM_LOCKING) && !defined(HAVE_KERNEL_PARAM_LOCK)
-       kernel_param_lock(THIS_MODULE);
-#endif
        if (!*((unsigned int *)kp->arg)) {
                *((unsigned int *)kp->arg) = num;
-
-#if !defined(HAVE_MODULE_PARAM_LOCKING) && !defined(HAVE_KERNEL_PARAM_LOCK)
-               kernel_param_unlock(THIS_MODULE);
-#endif
                return 0;
        }
 
@@ -86,9 +79,6 @@ static int libcfs_param_debug_mb_set(const char *val,
        if (!rc)
                *((unsigned int *)kp->arg) = cfs_trace_get_debug_mb();
 
-#if !defined(HAVE_MODULE_PARAM_LOCKING) && !defined(HAVE_KERNEL_PARAM_LOCK)
-       kernel_param_unlock(THIS_MODULE);
-#endif
        return rc;
 }