redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: lustre: lustre: libcfs: Replaced printk() with pr_err() and pr_cont() 

The following checkpatch warning was fixed:

Prefer [subsystem eg: netdev]_err([subsystem]dev

with the help of Coccinelle. pr_cont() was used to replace those printk
statements which followed a printk that did not end with a '\n'. The following
semantic patch was used to replace printk() with pr_err():

@a@
expression e;
@@

printk(e,...);

@script:python b@
e << a.e;
y;
@@

import re
match = re.match('KERN_ERR ', e);
if (match == None):
    cocci.include_match(False)

else:
    m = re.sub('KERN_ERR ', '', e)
    coccinelle.y = m;

@c@
expression a.e;
identifier b.y;
@@

- printk(e,
+ pr_err(y,
  ...);

Signed-off-by: Tina Johnson <tinajohnson.1234@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Tina Johnson 2015-03-02 23:40:26 +05:30 committed by Greg Kroah-Hartman
parent 85b7a9de00
commit 324588eccc
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/staging/lustre/lustre/libcfs/tracefile.c
View File

@ -224,8 +224,7 @@ static struct cfs_trace_page *cfs_trace_get_tage(struct cfs_trace_cpu_data *tcd,
*/
if (len > PAGE_CACHE_SIZE) {
printk(KERN_ERR
"cowardly refusing to write %lu bytes in a page\n", len);
pr_err("cowardly refusing to write %lu bytes in a page\n", len);
return NULL;
}
@ -688,8 +687,8 @@ int cfs_tracefile_dump_all_pages(char *filename)
if (IS_ERR(filp)) {
rc = PTR_ERR(filp);
filp = NULL;
printk(KERN_ERR "LustreError: can't open %s for dump: rc %d\n",
filename, rc);
pr_err("LustreError: can't open %s for dump: rc %d\n",
filename, rc);
goto out;
}
@ -726,7 +725,7 @@ int cfs_tracefile_dump_all_pages(char *filename)
MMSPACE_CLOSE;
rc = vfs_fsync(filp, 1);
if (rc)
printk(KERN_ERR "sync returns %d\n", rc);
pr_err("sync returns %d\n", rc);
close:
filp_close(filp, NULL);
out:
@ -1048,22 +1047,21 @@ static int tracefiled(void *arg)
int i;
printk(KERN_ALERT "Lustre: trace pages aren't empty\n");
printk(KERN_ERR "total cpus(%d): ",
num_possible_cpus());
pr_err("total cpus(%d): ",
num_possible_cpus());
for (i = 0; i < num_possible_cpus(); i++)
if (cpu_online(i))
printk(KERN_ERR "%d(on) ", i);
pr_cont("%d(on) ", i);
else
printk(KERN_ERR "%d(off) ", i);
printk(KERN_ERR "\n");
pr_cont("%d(off) ", i);
pr_cont("\n");
i = 0;
list_for_each_entry_safe(tage, tmp, &pc.pc_pages,
linkage)
printk(KERN_ERR "page %d belongs to cpu %d\n",
++i, tage->cpu);
printk(KERN_ERR "There are %d pages unwritten\n",
i);
pr_err("page %d belongs to cpu %d\n",
++i, tage->cpu);
pr_err("There are %d pages unwritten\n", i);
}
__LASSERT(list_empty(&pc.pc_pages));
end_loop: