mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
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:
parent
447a7f934e
commit
f7b24d5397
1 changed files with 22 additions and 28 deletions
|
@ -192,9 +192,8 @@ cfs_trace_get_tage_try(struct cfs_trace_cpu_data *tcd, unsigned long len)
|
|||
if (unlikely(!tage)) {
|
||||
if ((!memory_pressure_get() ||
|
||||
in_interrupt()) && printk_ratelimit())
|
||||
printk(KERN_WARNING
|
||||
"cannot allocate a tage (%ld)\n",
|
||||
tcd->tcd_cur_pages);
|
||||
pr_warn("cannot allocate a tage (%ld)\n",
|
||||
tcd->tcd_cur_pages);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
@ -230,8 +229,8 @@ static void cfs_tcd_shrink(struct cfs_trace_cpu_data *tcd)
|
|||
*/
|
||||
|
||||
if (printk_ratelimit())
|
||||
printk(KERN_WARNING "debug daemon buffer overflowed; discarding 10%% of pages (%d of %ld)\n",
|
||||
pgcount + 1, tcd->tcd_cur_pages);
|
||||
pr_warn("debug daemon buffer overflowed; discarding 10%% of pages (%d of %ld)\n",
|
||||
pgcount + 1, tcd->tcd_cur_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;
|
||||
if (max_nob <= 0) {
|
||||
printk(KERN_EMERG "negative max_nob: %d\n",
|
||||
max_nob);
|
||||
pr_emerg("negative max_nob: %d\n", max_nob);
|
||||
mask |= D_ERROR;
|
||||
cfs_trace_put_tcd(tcd);
|
||||
tcd = NULL;
|
||||
|
@ -389,8 +387,8 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,
|
|||
}
|
||||
|
||||
if (*(string_buf + needed - 1) != '\n')
|
||||
printk(KERN_INFO "format at %s:%d:%s doesn't end in newline\n",
|
||||
file, msgdata->msg_line, msgdata->msg_fn);
|
||||
pr_info("format at %s:%d:%s doesn't end in newline\n", file,
|
||||
msgdata->msg_line, msgdata->msg_fn);
|
||||
|
||||
header.ph_len = known_size + needed;
|
||||
debug_buf = (char *)page_address(tage->page) + tage->used;
|
||||
|
@ -739,8 +737,8 @@ int cfs_tracefile_dump_all_pages(char *filename)
|
|||
kunmap(tage->page);
|
||||
|
||||
if (rc != (int)tage->used) {
|
||||
printk(KERN_WARNING "wanted to write %u but wrote %d\n",
|
||||
tage->used, rc);
|
||||
pr_warn("wanted to write %u but wrote %d\n", tage->used,
|
||||
rc);
|
||||
put_pages_back(&pc);
|
||||
__LASSERT(list_empty(&pc.pc_pages));
|
||||
break;
|
||||
|
@ -894,10 +892,9 @@ int cfs_trace_daemon_command(char *str)
|
|||
} else {
|
||||
strcpy(cfs_tracefile, str);
|
||||
|
||||
printk(KERN_INFO
|
||||
"Lustre: debug daemon will attempt to start writing to %s (%lukB max)\n",
|
||||
cfs_tracefile,
|
||||
(long)(cfs_tracefile_size >> 10));
|
||||
pr_info("Lustre: debug daemon will attempt to start writing to %s (%lukB max)\n",
|
||||
cfs_tracefile,
|
||||
(long)(cfs_tracefile_size >> 10));
|
||||
|
||||
cfs_trace_start_thread();
|
||||
}
|
||||
|
@ -933,16 +930,14 @@ int cfs_trace_set_debug_mb(int mb)
|
|||
struct cfs_trace_cpu_data *tcd;
|
||||
|
||||
if (mb < num_possible_cpus()) {
|
||||
printk(KERN_WARNING
|
||||
"Lustre: %d MB is too small for debug buffer size, setting it to %d MB.\n",
|
||||
mb, num_possible_cpus());
|
||||
pr_warn("Lustre: %d MB is too small for debug buffer size, setting it to %d MB.\n",
|
||||
mb, num_possible_cpus());
|
||||
mb = num_possible_cpus();
|
||||
}
|
||||
|
||||
if (mb > limit) {
|
||||
printk(KERN_WARNING
|
||||
"Lustre: %d MB is too large for debug buffer size, setting it to %d MB.\n",
|
||||
mb, limit);
|
||||
pr_warn("Lustre: %d MB is too large for debug buffer size, setting it to %d MB.\n",
|
||||
mb, limit);
|
||||
mb = limit;
|
||||
}
|
||||
|
||||
|
@ -1010,8 +1005,8 @@ static int tracefiled(void *arg)
|
|||
if (IS_ERR(filp)) {
|
||||
rc = PTR_ERR(filp);
|
||||
filp = NULL;
|
||||
printk(KERN_WARNING "couldn't open %s: %d\n",
|
||||
cfs_tracefile, rc);
|
||||
pr_warn("couldn't open %s: %d\n", cfs_tracefile,
|
||||
rc);
|
||||
}
|
||||
}
|
||||
cfs_tracefile_read_unlock();
|
||||
|
@ -1039,8 +1034,8 @@ static int tracefiled(void *arg)
|
|||
kunmap(tage->page);
|
||||
|
||||
if (rc != (int)tage->used) {
|
||||
printk(KERN_WARNING "wanted to write %u but wrote %d\n",
|
||||
tage->used, rc);
|
||||
pr_warn("wanted to write %u but wrote %d\n",
|
||||
tage->used, rc);
|
||||
put_pages_back(&pc);
|
||||
__LASSERT(list_empty(&pc.pc_pages));
|
||||
break;
|
||||
|
@ -1053,7 +1048,7 @@ static int tracefiled(void *arg)
|
|||
if (!list_empty(&pc.pc_pages)) {
|
||||
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());
|
||||
for (i = 0; i < num_possible_cpus(); i++)
|
||||
if (cpu_online(i))
|
||||
|
@ -1123,8 +1118,7 @@ void cfs_trace_stop_thread(void)
|
|||
|
||||
mutex_lock(&cfs_trace_thread_mutex);
|
||||
if (thread_running) {
|
||||
printk(KERN_INFO
|
||||
"Lustre: shutting down debug daemon thread...\n");
|
||||
pr_info("Lustre: shutting down debug daemon thread...\n");
|
||||
atomic_set(&tctl->tctl_shutdown, 1);
|
||||
wait_for_completion(&tctl->tctl_stop);
|
||||
thread_running = 0;
|
||||
|
|
Loading…
Reference in a new issue