[PATCH 1/2] Staging: lustre: libcfs: Use pr_info and pr_warn macros
Shraddha Barke
shraddha.6596 at gmail.com
Mon Sep 14 13:44:12 UTC 2015
Replace all occurrences of printk(KERN_* by pr_info and pr_warn macros.
Build tested it.
Signed-off-by: Shraddha Barke <shraddha.6596 at gmail.com>
---
drivers/staging/lustre/lustre/libcfs/tracefile.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/lustre/lustre/libcfs/tracefile.c b/drivers/staging/lustre/lustre/libcfs/tracefile.c
index effa2af..bba665a 100644
--- a/drivers/staging/lustre/lustre/libcfs/tracefile.c
+++ b/drivers/staging/lustre/lustre/libcfs/tracefile.c
@@ -196,7 +196,7 @@ 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",
+ 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);
@@ -355,7 +355,7 @@ 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",
+ 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;
@@ -713,7 +713,7 @@ 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",
+ pr_warn("wanted to write %u but wrote %d\n",
tage->used, rc);
put_pages_back(&pc);
__LASSERT(list_empty(&pc.pc_pages));
@@ -872,8 +872,7 @@ 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",
+ pr_info("Lustre: debug daemon will attempt to start writing to %s (%lukB max)\n",
cfs_tracefile,
(long)(cfs_tracefile_size >> 10));
@@ -911,15 +910,13 @@ 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",
+ 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",
+ pr_warn("Lustre: %d MB is too large for debug buffer size, setting it to %d MB.\n",
mb, limit);
mb = limit;
}
@@ -990,7 +987,7 @@ static int tracefiled(void *arg)
if (IS_ERR(filp)) {
rc = PTR_ERR(filp);
filp = NULL;
- printk(KERN_WARNING "couldn't open %s: %d\n",
+ pr_warn("couldn't open %s: %d\n",
cfs_tracefile, rc);
}
}
@@ -1103,8 +1100,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;
--
2.1.4
More information about the devel
mailing list