p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fs/devpts/inode.c: convert printk to pr_foo() 

Also convert spaces to tabs (checkpatch warnings) if (!dentry) KERN_NOTICE
converted to pr_err (like if (!inode) error process)

[akpm@linux-foundation.org: use KBUILD_MODNAME, per Joe]
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Joe Perches <joe@perches.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Fabian Frederick 2014-06-06 14:37:34 -07:00 committed by Linus Torvalds
parent 0227d6abb3
commit 04541a2f31
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/devpts/inode.c
View File

@ -10,6 +10,8 @@
* *
* ------------------------------------------------------------------------- */ * ------------------------------------------------------------------------- */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/fs.h> #include <linux/fs.h>
@ -148,10 +150,10 @@ static inline struct super_block *pts_sb_from_inode(struct inode *inode)
/* /*
* parse_mount_options(): * parse_mount_options():
* Set @opts to mount options specified in @data. If an option is not * Set @opts to mount options specified in @data. If an option is not
* specified in @data, set it to its default value. The exception is * specified in @data, set it to its default value. The exception is
* 'newinstance' option which can only be set/cleared on a mount (i.e. * 'newinstance' option which can only be set/cleared on a mount (i.e.
* cannot be changed during remount). * cannot be changed during remount).
* *
* Note: @data may be NULL (in which case all options are set to default). * Note: @data may be NULL (in which case all options are set to default).
*/ */
@ -225,7 +227,7 @@ static int parse_mount_options(char *data, int op, struct pts_mount_opts *opts)
break; break;
#endif #endif
default: default:
printk(KERN_ERR "devpts: called with bogus options\n"); pr_err("called with bogus options\n");
return -EINVAL; return -EINVAL;
} }
} }
@ -261,7 +263,7 @@ static int mknod_ptmx(struct super_block *sb)
dentry = d_alloc_name(root, "ptmx"); dentry = d_alloc_name(root, "ptmx");
if (!dentry) { if (!dentry) {
printk(KERN_NOTICE "Unable to alloc dentry for ptmx node\n"); pr_err("Unable to alloc dentry for ptmx node\n");
goto out; goto out;
} }
@ -270,7 +272,7 @@ static int mknod_ptmx(struct super_block *sb)
*/ */
inode = new_inode(sb); inode = new_inode(sb);
if (!inode) { if (!inode) {
printk(KERN_ERR "Unable to alloc inode for ptmx node\n"); pr_err("Unable to alloc inode for ptmx node\n");
dput(dentry); dput(dentry);
goto out; goto out;
} }
@ -303,7 +305,7 @@ static void update_ptmx_mode(struct pts_fs_info *fsi)
#else #else
static inline void update_ptmx_mode(struct pts_fs_info *fsi) static inline void update_ptmx_mode(struct pts_fs_info *fsi)
{ {
return; return;
} }
#endif #endif
@ -333,9 +335,11 @@ static int devpts_show_options(struct seq_file *seq, struct dentry *root)
struct pts_mount_opts *opts = &fsi->mount_opts; struct pts_mount_opts *opts = &fsi->mount_opts;
if (opts->setuid) if (opts->setuid)
seq_printf(seq, ",uid=%u", from_kuid_munged(&init_user_ns, opts->uid)); seq_printf(seq, ",uid=%u",
from_kuid_munged(&init_user_ns, opts->uid));
if (opts->setgid) if (opts->setgid)
seq_printf(seq, ",gid=%u", from_kgid_munged(&init_user_ns, opts->gid)); seq_printf(seq, ",gid=%u",
from_kgid_munged(&init_user_ns, opts->gid));
seq_printf(seq, ",mode=%03o", opts->mode); seq_printf(seq, ",mode=%03o", opts->mode);
#ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES #ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES
seq_printf(seq, ",ptmxmode=%03o", opts->ptmxmode); seq_printf(seq, ",ptmxmode=%03o", opts->ptmxmode);
@ -396,7 +400,7 @@ devpts_fill_super(struct super_block *s, void *data, int silent)
if (s->s_root) if (s->s_root)
return 0; return 0;
printk(KERN_ERR "devpts: get root dentry failed\n"); pr_err("get root dentry failed\n");
fail: fail:
return -ENOMEM; return -ENOMEM;