LU-15317 libcfs: Remove D_TTY

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

diff --git a/libcfs/libcfs/debug.c b/libcfs/libcfs/debug.c
index b6d8b42..8873cfb 100644 (file)
--- a/libcfs/libcfs/debug.c
+++ b/libcfs/libcfs/debug.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * libcfs/libcfs/debug.c
  *
@@ -54,7 +53,7 @@ module_param(libcfs_subsystem_debug, int, 0644);
 MODULE_PARM_DESC(libcfs_subsystem_debug, "Lustre kernel debug subsystem mask");
 
 unsigned int libcfs_debug = (D_CANTMASK | D_NETERROR | D_HA | D_CONFIG |
-                            D_IOCTL | D_LFSCK | D_TTY);
+                            D_IOCTL | D_LFSCK);
 EXPORT_SYMBOL(libcfs_debug);
 module_param(libcfs_debug, int, 0644);
 MODULE_PARM_DESC(libcfs_debug, "Lustre kernel debug mask");
@@ -189,6 +188,7 @@ module_param_call(libcfs_console_min_delay, param_set_console_min_delay,
 #endif
 MODULE_PARM_DESC(libcfs_console_min_delay, "Lustre kernel debug console min delay (jiffies)");
 
+#ifndef HAVE_PARAM_SET_UINT_MINMAX
 static int param_set_uint_minmax(const char *val,
                                 cfs_kernel_param_arg_t *kp,
                                 unsigned int min, unsigned int max)
@@ -206,6 +206,7 @@ static int param_set_uint_minmax(const char *val,
        *((unsigned int *)kp->arg) = num;
        return 0;
 }
+#endif
 
 static int param_set_uintpos(const char *val,
                             cfs_kernel_param_arg_t *kp)
@@ -250,11 +251,9 @@ EXPORT_SYMBOL(libcfs_kmem);
 
 static DECLARE_COMPLETION(debug_complete);
 
-char libcfs_debug_file_path_arr[PATH_MAX] = LIBCFS_DEBUG_FILE_PATH_DEFAULT;
-EXPORT_SYMBOL(libcfs_debug_file_path_arr);
-
 /* We need to pass a pointer here, but elsewhere this must be a const */
-static char *libcfs_debug_file_path = LIBCFS_DEBUG_FILE_PATH_DEFAULT;
+char *libcfs_debug_file_path = LIBCFS_DEBUG_FILE_PATH_DEFAULT;
+EXPORT_SYMBOL(libcfs_debug_file_path);
 module_param(libcfs_debug_file_path, charp, 0644);
 MODULE_PARM_DESC(libcfs_debug_file_path,
                 "Path for dumping debug logs, set 'NONE' to prevent log dumping");
@@ -403,11 +402,11 @@ static void libcfs_debug_dumplog_internal(void *arg)
 
        current_time = ktime_get_real_seconds();
 
-       if (strncmp(libcfs_debug_file_path_arr, "NONE", 4) != 0 &&
+       if (strncmp(libcfs_debug_file_path, "NONE", 4) != 0 &&
            current_time > last_dump_time) {
                last_dump_time = current_time;
                snprintf(debug_file_name, sizeof(debug_file_name) - 1,
-                        "%s.%lld.%ld", libcfs_debug_file_path_arr,
+                        "%s.%lld.%ld", libcfs_debug_file_path,
                         (s64)current_time, (uintptr_t)arg);
                pr_alert("LustreError: dumping log to %s\n", debug_file_name);
                cfs_tracefile_dump_all_pages(debug_file_name);
@@ -518,7 +517,7 @@ void __init cfs_debug_init(void)
 {
 #ifdef CONFIG_ARCH_STACKWALK
        task_dump_stack = (void *)
-                       kallsyms_lookup_name("stack_trace_save_tsk");
+                       cfs_kallsyms_lookup_name("stack_trace_save_tsk");
 
 #endif
 }
@@ -637,6 +636,16 @@ static int panic_notifier(struct notifier_block *self, unsigned long unused1,
        libcfs_panic_in_progress = 1;
        mb();
 
+#ifdef LNET_DUMP_ON_PANIC
+       /* This is currently disabled because it spews far too much to the
+        * console on the rare cases it is ever triggered. */
+
+       if (in_interrupt()) {
+               cfs_trace_debug_print();
+       } else {
+               libcfs_debug_dumplog_internal((void *)(long)current->pid);
+       }
+#endif
        return 0;
 }
 
@@ -670,12 +679,6 @@ int libcfs_debug_init(unsigned long bufsize)
                libcfs_console_min_delay = CDEBUG_DEFAULT_MIN_DELAY;
        }
 
-       if (libcfs_debug_file_path) {
-               strlcpy(libcfs_debug_file_path_arr,
-                       libcfs_debug_file_path,
-                       sizeof(libcfs_debug_file_path_arr));
-       }
-
        /* If libcfs_debug_mb is uninitialized then just make the
         * total buffers smp_num_cpus * TCD_MAX_PAGES
         */
@@ -729,19 +732,3 @@ int libcfs_debug_mark_buffer(const char *text)
 
 #undef DEBUG_SUBSYSTEM
 #define DEBUG_SUBSYSTEM S_LNET
-
-long libcfs_log_return(struct libcfs_debug_msg_data *msgdata, long rc)
-{
-       libcfs_debug_msg(msgdata, "Process leaving (rc=%lu : %ld : %lx)\n",
-                        rc, rc, rc);
-       return rc;
-}
-EXPORT_SYMBOL(libcfs_log_return);
-
-void libcfs_log_goto(struct libcfs_debug_msg_data *msgdata, const char *label,
-                    long rc)
-{
-       libcfs_debug_msg(msgdata, "Process leaving via %s (rc=%lu : %ld"
-                        " : %#lx)\n", label, rc, rc, rc);
-}
-EXPORT_SYMBOL(libcfs_log_goto);