diff options
Diffstat (limited to 'drivers/staging/lustre/lustre/libcfs/debug.c')
| -rw-r--r-- | drivers/staging/lustre/lustre/libcfs/debug.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/staging/lustre/lustre/libcfs/debug.c b/drivers/staging/lustre/lustre/libcfs/debug.c index 6b584698d3ae..ba43b3067fa3 100644 --- a/drivers/staging/lustre/lustre/libcfs/debug.c +++ b/drivers/staging/lustre/lustre/libcfs/debug.c @@ -314,9 +314,8 @@ libcfs_debug_str2mask(int *mask, const char *str, int is_subsys) if (!isspace(str[n-1])) break; matched = n; - - if ((t = sscanf(str, "%i%n", &m, &matched)) >= 1 && - matched == n) { + t = sscanf(str, "%i%n", &m, &matched); + if (t >= 1 && matched == n) { /* don't print warning for lctl set_param debug=0 or -1 */ if (m != 0 && m != -1) CWARN("You are trying to use a numerical value for the " @@ -344,7 +343,7 @@ void libcfs_debug_dumplog_internal(void *arg) snprintf(debug_file_name, sizeof(debug_file_name) - 1, "%s.%ld.%ld", libcfs_debug_file_path_arr, get_seconds(), (long_ptr_t)arg); - printk(KERN_ALERT "LustreError: dumping log to %s\n", + pr_alert("LustreError: dumping log to %s\n", debug_file_name); cfs_tracefile_dump_all_pages(debug_file_name); libcfs_run_debug_log_upcall(debug_file_name); @@ -376,7 +375,7 @@ void libcfs_debug_dumplog(void) (void *)(long)current_pid(), "libcfs_debug_dumper"); if (IS_ERR(dumper)) - printk(KERN_ERR "LustreError: cannot start log dump thread:" + pr_err("LustreError: cannot start log dump thread:" " %ld\n", PTR_ERR(dumper)); else schedule(); @@ -402,9 +401,9 @@ int libcfs_debug_init(unsigned long bufsize) } if (libcfs_debug_file_path != NULL) { - memset(libcfs_debug_file_path_arr, 0, PATH_MAX); strncpy(libcfs_debug_file_path_arr, libcfs_debug_file_path, PATH_MAX-1); + libcfs_debug_file_path_arr[PATH_MAX - 1] = '\0'; } /* If libcfs_debug_mb is set to an invalid value or uninitialized @@ -442,9 +441,11 @@ int libcfs_debug_clear_buffer(void) #define DEBUG_SUBSYSTEM S_UNDEFINED int libcfs_debug_mark_buffer(const char *text) { - CDEBUG(D_TRACE,"***************************************************\n"); + CDEBUG(D_TRACE, + "***************************************************\n"); LCONSOLE(D_WARNING, "DEBUG MARKER: %s\n", text); - CDEBUG(D_TRACE,"***************************************************\n"); + CDEBUG(D_TRACE, + "***************************************************\n"); return 0; } @@ -453,7 +454,7 @@ int libcfs_debug_mark_buffer(const char *text) void libcfs_debug_set_level(unsigned int debug_level) { - printk(KERN_WARNING "Lustre: Setting portals debug level to %08x\n", + pr_warn("Lustre: Setting portals debug level to %08x\n", debug_level); libcfs_debug = debug_level; } |