hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: lustre: libcfs: Replace printk() with pr_*() 

Convert printk() calls into corresponding pr_*() calls.

Signed-off-by: Narcisa Ana Maria Vasile <narcisaanamaria12@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Narcisa Ana Maria Vasile 2017-03-18 18:55:25 +02:00 committed by Greg Kroah-Hartman
parent 447a7f934e
commit f7b24d5397
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/staging/lustre/lnet/libcfs/tracefile.c
View File

@ -192,9 +192,8 @@ cfs_trace_get_tage_try(struct cfs_trace_cpu_data *tcd, unsigned long len)
if (unlikely(!tage)) { if (unlikely(!tage)) {
if ((!memory_pressure_get() || if ((!memory_pressure_get() ||
in_interrupt()) && printk_ratelimit()) in_interrupt()) && printk_ratelimit())
printk(KERN_WARNING pr_warn("cannot allocate a tage (%ld)\n",
"cannot allocate a tage (%ld)\n", tcd->tcd_cur_pages);
tcd->tcd_cur_pages);
return NULL; return NULL;
} }
} }
@ -230,8 +229,8 @@ static void cfs_tcd_shrink(struct cfs_trace_cpu_data *tcd)
*/ */
if (printk_ratelimit()) if (printk_ratelimit())
printk(KERN_WARNING "debug daemon buffer overflowed; discarding 10%% of pages (%d of %ld)\n", pr_warn("debug daemon buffer overflowed; discarding 10%% of pages (%d of %ld)\n",
pgcount + 1, tcd->tcd_cur_pages); pgcount + 1, tcd->tcd_cur_pages);
INIT_LIST_HEAD(&pc.pc_pages); INIT_LIST_HEAD(&pc.pc_pages);
@ -358,8 +357,7 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,
max_nob = PAGE_SIZE - tage->used - known_size; max_nob = PAGE_SIZE - tage->used - known_size;
if (max_nob <= 0) { if (max_nob <= 0) {
printk(KERN_EMERG "negative max_nob: %d\n", pr_emerg("negative max_nob: %d\n", max_nob);
max_nob);
mask |= D_ERROR; mask |= D_ERROR;
cfs_trace_put_tcd(tcd); cfs_trace_put_tcd(tcd);
tcd = NULL; tcd = NULL;
@ -389,8 +387,8 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,
} }
if (*(string_buf + needed - 1) != '\n') if (*(string_buf + needed - 1) != '\n')
printk(KERN_INFO "format at %s:%d:%s doesn't end in newline\n", pr_info("format at %s:%d:%s doesn't end in newline\n", file,
file, msgdata->msg_line, msgdata->msg_fn); msgdata->msg_line, msgdata->msg_fn);
header.ph_len = known_size + needed; header.ph_len = known_size + needed;
debug_buf = (char *)page_address(tage->page) + tage->used; debug_buf = (char *)page_address(tage->page) + tage->used;
@ -739,8 +737,8 @@ int cfs_tracefile_dump_all_pages(char *filename)
kunmap(tage->page); kunmap(tage->page);
if (rc != (int)tage->used) { if (rc != (int)tage->used) {
printk(KERN_WARNING "wanted to write %u but wrote %d\n", pr_warn("wanted to write %u but wrote %d\n", tage->used,
tage->used, rc); rc);
put_pages_back(&pc); put_pages_back(&pc);
__LASSERT(list_empty(&pc.pc_pages)); __LASSERT(list_empty(&pc.pc_pages));
break; break;
@ -894,10 +892,9 @@ int cfs_trace_daemon_command(char *str)
} else { } else {
strcpy(cfs_tracefile, str); strcpy(cfs_tracefile, str);
printk(KERN_INFO pr_info("Lustre: debug daemon will attempt to start writing to %s (%lukB max)\n",
"Lustre: debug daemon will attempt to start writing to %s (%lukB max)\n", cfs_tracefile,
cfs_tracefile, (long)(cfs_tracefile_size >> 10));
(long)(cfs_tracefile_size >> 10));
cfs_trace_start_thread(); cfs_trace_start_thread();
} }
@ -933,16 +930,14 @@ int cfs_trace_set_debug_mb(int mb)
struct cfs_trace_cpu_data *tcd; struct cfs_trace_cpu_data *tcd;
if (mb < num_possible_cpus()) { if (mb < num_possible_cpus()) {
printk(KERN_WARNING pr_warn("Lustre: %d MB is too small for debug buffer size, setting it to %d MB.\n",
"Lustre: %d MB is too small for debug buffer size, setting it to %d MB.\n", mb, num_possible_cpus());
mb, num_possible_cpus());
mb = num_possible_cpus(); mb = num_possible_cpus();
} }
if (mb > limit) { if (mb > limit) {
printk(KERN_WARNING pr_warn("Lustre: %d MB is too large for debug buffer size, setting it to %d MB.\n",
"Lustre: %d MB is too large for debug buffer size, setting it to %d MB.\n", mb, limit);
mb, limit);
mb = limit; mb = limit;
} }
@ -1010,8 +1005,8 @@ static int tracefiled(void *arg)
if (IS_ERR(filp)) { if (IS_ERR(filp)) {
rc = PTR_ERR(filp); rc = PTR_ERR(filp);
filp = NULL; filp = NULL;
printk(KERN_WARNING "couldn't open %s: %d\n", pr_warn("couldn't open %s: %d\n", cfs_tracefile,
cfs_tracefile, rc); rc);
} }
} }
cfs_tracefile_read_unlock(); cfs_tracefile_read_unlock();
@ -1039,8 +1034,8 @@ static int tracefiled(void *arg)
kunmap(tage->page); kunmap(tage->page);
if (rc != (int)tage->used) { if (rc != (int)tage->used) {
printk(KERN_WARNING "wanted to write %u but wrote %d\n", pr_warn("wanted to write %u but wrote %d\n",
tage->used, rc); tage->used, rc);
put_pages_back(&pc); put_pages_back(&pc);
__LASSERT(list_empty(&pc.pc_pages)); __LASSERT(list_empty(&pc.pc_pages));
break; break;
@ -1053,7 +1048,7 @@ static int tracefiled(void *arg)
if (!list_empty(&pc.pc_pages)) { if (!list_empty(&pc.pc_pages)) {
int i; int i;
printk(KERN_ALERT "Lustre: trace pages aren't empty\n"); pr_alert("Lustre: trace pages aren't empty\n");
pr_err("total cpus(%d): ", num_possible_cpus()); pr_err("total cpus(%d): ", num_possible_cpus());
for (i = 0; i < num_possible_cpus(); i++) for (i = 0; i < num_possible_cpus(); i++)
if (cpu_online(i)) if (cpu_online(i))
@ -1123,8 +1118,7 @@ void cfs_trace_stop_thread(void)
mutex_lock(&cfs_trace_thread_mutex); mutex_lock(&cfs_trace_thread_mutex);
if (thread_running) { if (thread_running) {
printk(KERN_INFO pr_info("Lustre: shutting down debug daemon thread...\n");
"Lustre: shutting down debug daemon thread...\n");
atomic_set(&tctl->tctl_shutdown, 1); atomic_set(&tctl->tctl_shutdown, 1);
wait_for_completion(&tctl->tctl_stop); wait_for_completion(&tctl->tctl_stop);
thread_running = 0; thread_running = 0;