mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-25 08:02:56 +00:00
mm: convert printk(KERN_<LEVEL> to pr_<level>
Most of the mm subsystem uses pr_<level> so make it consistent. Miscellanea: - Realign arguments - Add missing newline to format - kmemleak-test.c has a "kmemleak: " prefix added to the "Kmemleak testing" logging message via pr_fmt Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Tejun Heo <tj@kernel.org> [percpu] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
756a025f00
commit
1170532bb4
20 changed files with 118 additions and 150 deletions
14
mm/shmem.c
14
mm/shmem.c
|
@ -2823,9 +2823,8 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo,
|
|||
if ((value = strchr(this_char,'=')) != NULL) {
|
||||
*value++ = 0;
|
||||
} else {
|
||||
printk(KERN_ERR
|
||||
"tmpfs: No value for mount option '%s'\n",
|
||||
this_char);
|
||||
pr_err("tmpfs: No value for mount option '%s'\n",
|
||||
this_char);
|
||||
goto error;
|
||||
}
|
||||
|
||||
|
@ -2880,8 +2879,7 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo,
|
|||
if (mpol_parse_str(value, &mpol))
|
||||
goto bad_val;
|
||||
} else {
|
||||
printk(KERN_ERR "tmpfs: Bad mount option %s\n",
|
||||
this_char);
|
||||
pr_err("tmpfs: Bad mount option %s\n", this_char);
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
|
@ -2889,7 +2887,7 @@ static int shmem_parse_options(char *options, struct shmem_sb_info *sbinfo,
|
|||
return 0;
|
||||
|
||||
bad_val:
|
||||
printk(KERN_ERR "tmpfs: Bad value '%s' for mount option '%s'\n",
|
||||
pr_err("tmpfs: Bad value '%s' for mount option '%s'\n",
|
||||
value, this_char);
|
||||
error:
|
||||
mpol_put(mpol);
|
||||
|
@ -3286,14 +3284,14 @@ int __init shmem_init(void)
|
|||
|
||||
error = register_filesystem(&shmem_fs_type);
|
||||
if (error) {
|
||||
printk(KERN_ERR "Could not register tmpfs\n");
|
||||
pr_err("Could not register tmpfs\n");
|
||||
goto out2;
|
||||
}
|
||||
|
||||
shm_mnt = kern_mount(&shmem_fs_type);
|
||||
if (IS_ERR(shm_mnt)) {
|
||||
error = PTR_ERR(shm_mnt);
|
||||
printk(KERN_ERR "Could not kern_mount tmpfs\n");
|
||||
pr_err("Could not kern_mount tmpfs\n");
|
||||
goto out1;
|
||||
}
|
||||
return 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue