X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2Fdebug.c;h=412a10c069fd1ed2ef583e57a07df1fdc1eaaff3;hp=d82b2c19acce4ffd14d05f442ca08bb12cabd3da;hb=f7392c7c4a16bc1127ee448f937ba81c50dcdfd5;hpb=b2d73351e64677cb8ff650d92a8744634f73e0fd diff --git a/libcfs/libcfs/debug.c b/libcfs/libcfs/debug.c index d82b2c1..412a10c 100644 --- a/libcfs/libcfs/debug.c +++ b/libcfs/libcfs/debug.c @@ -250,11 +250,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 +401,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); @@ -680,12 +678,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 */