Re: [PATCH 43/45] staging/lustre/libcfs: Replace use of printk with pr_

Joe Perches
2016-02-16T05:55:24Z

On Tue, 2016-02-16 at 00:47 -0500, green@linuxhacker.ru wrote:
> From: Oleg Drokin <green@linuxhacker.ru>
>
> This pacifies checkpatch amongst other things, also is shorter to write
> and avoiding calls to printk_ratelimit() is also good.
[]
> diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c
[]
> @@ -244,11 +244,11 @@ void cfs_print_to_console(struct ptldebug_header *hdr, int mask,
>   }
>
>   if ((mask & D_CONSOLE) != 0) {
> - printk("%s%s: %.*s", ptype, prefix, len, buf);
> + pr_err("%s%s: %.*s", ptype, prefix, len, buf);
>   } else {
> - printk("%s%s: %d:%d:(%s:%d:%s()) %.*s", ptype, prefix,
> -        hdr->ph_pid, hdr->ph_extern_pid, file, hdr->ph_line_num,
> -        fn, len, buf);
> + pr_warn("%s%s: %d:%d:(%s:%d:%s()) %.*s", ptype, prefix,
> + hdr->ph_pid, hdr->ph_extern_pid, file, hdr->ph_line_num,
> + fn, len, buf);
>   }
>  }

This breaks the currently correct output.

ptype is already a KERN_<LEVEL>

char *prefix = "Lustre", *ptype = NULL;

if ((mask & D_EMERG) != 0) {
prefix = dbghdr_to_err_string(hdr);
ptype = KERN_EMERG;
} else if ((mask & D_ERROR) != 0) {
prefix = dbghdr_to_err_string(hdr);
ptype = KERN_ERR;
} else if ((mask & D_WARNING) != 0) {
prefix = dbghdr_to_info_string(hdr);
ptype = KERN_WARNING;
} else if ((mask & (D_CONSOLE | libcfs_printk)) != 0) {
prefix = dbghdr_to_info_string(hdr);
ptype = KERN_INFO;
}