[PATCH 1/1] fs/devpts/inode.c: convert printk to pr_foo()

[PATCH 1/1] fs/devpts/inode.c: convert printk to pr_foo()

[Fabian Frederick]

Also convert spaces to tabs (checkpatch warnings)

Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 fs/devpts/inode.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index c710380..4eb41f7 100644
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -148,10 +148,10 @@ static inline struct super_block *pts_sb_from_inode(struct inode *inode)
 
 /*
  * parse_mount_options():
- * 	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
- * 	'newinstance' option which can only be set/cleared on a mount (i.e.
- * 	cannot be changed during remount).
+ *	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
+ *	'newinstance' option which can only be set/cleared on a mount (i.e.
+ *	cannot be changed during remount).
  *
  * Note: @data may be NULL (in which case all options are set to default).
  */
@@ -225,7 +225,7 @@ static int parse_mount_options(char *data, int op, struct pts_mount_opts *opts)
 			break;
 #endif
 		default:
-			printk(KERN_ERR "devpts: called with bogus options\n");
+			pr_err("devpts: called with bogus options\n");
 			return -EINVAL;
 		}
 	}
@@ -261,7 +261,7 @@ static int mknod_ptmx(struct super_block *sb)
 
 	dentry = d_alloc_name(root, "ptmx");
 	if (!dentry) {
-		printk(KERN_NOTICE "Unable to alloc dentry for ptmx node\n");
+		pr_notice("Unable to alloc dentry for ptmx node\n");
 		goto out;
 	}
 
@@ -270,7 +270,7 @@ static int mknod_ptmx(struct super_block *sb)
 	 */
 	inode = new_inode(sb);
 	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);
 		goto out;
 	}
@@ -303,7 +303,7 @@ static void update_ptmx_mode(struct pts_fs_info *fsi)
 #else
 static inline void update_ptmx_mode(struct pts_fs_info *fsi)
 {
-       return;
+	return;
 }
 #endif
 
@@ -333,9 +333,11 @@ static int devpts_show_options(struct seq_file *seq, struct dentry *root)
 	struct pts_mount_opts *opts = &fsi->mount_opts;
 
 	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)
-		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);
 #ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES
 	seq_printf(seq, ",ptmxmode=%03o", opts->ptmxmode);
@@ -396,7 +398,7 @@ devpts_fill_super(struct super_block *s, void *data, int silent)
 	if (s->s_root)
 		return 0;
 
-	printk(KERN_ERR "devpts: get root dentry failed\n");
+	pr_err("devpts: get root dentry failed\n");
 
 fail:
 	return -ENOMEM;
-- 
1.8.4.5

Re: [PATCH 1/1] fs/devpts/inode.c: convert printk to pr_foo()

[Joe Perches]

On Tue, 2014-05-13 at 18:13 +0200, Fabian Frederick wrote:
> Also convert spaces to tabs (checkpatch warnings)
[]
> diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
[]

It may be better to add a #define pr_fmt

> @@ -225,7 +225,7 @@ static int parse_mount_options(char *data, int op, struct pts_mount_opts *opts)
>  			break;
>  #endif
>  		default:
> -			printk(KERN_ERR "devpts: called with bogus options\n");
> +			pr_err("devpts: called with bogus options\n");

and remove all the embedded "devpts: "

> @@ -261,7 +261,7 @@ static int mknod_ptmx(struct super_block *sb)
>  
>  	dentry = d_alloc_name(root, "ptmx");
>  	if (!dentry) {
> -		printk(KERN_NOTICE "Unable to alloc dentry for ptmx node\n");
> +		pr_notice("Unable to alloc dentry for ptmx node\n");
>  		goto out;
>  	}
>  
> @@ -270,7 +270,7 @@ static int mknod_ptmx(struct super_block *sb)
>  	 */
>  	inode = new_inode(sb);
>  	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);
>  		goto out;
>  	}

Adding pr_fmt would prefix these.

It seems odd that one of these is an err and the other a notice.