nilfs2: reduce bare use of printk() with nilfs_msg()

Replace most use of printk() in nilfs2 implementation with nilfs_msg(),
and reduce the following checkpatch.pl warning:

  "WARNING: Prefer [subsystem eg: netdev]_crit([subsystem]dev, ...
   then dev_crit(dev, ... then pr_crit(...  to printk(KERN_CRIT ..."

This patch also fixes a minor checkpatch warning "WARNING: quoted string
split across lines" that often accompanies the prior warning, and amends
message format as needed.

Link: http://lkml.kernel.org/r/1464875891-5443-5-git-send-email-konishi.ryusuke@lab.ntt.co.jp
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 16 insertions, 14 deletions

diff --git a/fs/nilfs2/sysfs.c b/fs/nilfs2/sysfs.c
index 8ffa42b704d8..8e57bb91fe16 100644
--- a/fs/nilfs2/sysfs.c
+++ b/fs/nilfs2/sysfs.c
@@ -272,8 +272,8 @@ nilfs_checkpoints_checkpoints_number_show(struct nilfs_checkpoints_attr *attr,
         err = nilfs_cpfile_get_stat(nilfs->ns_cpfile, &cpstat);
         up_read(&nilfs->ns_segctor_sem);
         if (err < 0) {
-                printk(KERN_ERR "NILFS: unable to get checkpoint stat: err=%d\n",
-                        err);
+                nilfs_msg(nilfs->ns_sb, KERN_ERR,
+                          "unable to get checkpoint stat: err=%d", err);
                 return err;
         }
 
@@ -295,8 +295,8 @@ nilfs_checkpoints_snapshots_number_show(struct nilfs_checkpoints_attr *attr,
         err = nilfs_cpfile_get_stat(nilfs->ns_cpfile, &cpstat);
         up_read(&nilfs->ns_segctor_sem);
         if (err < 0) {
-                printk(KERN_ERR "NILFS: unable to get checkpoint stat: err=%d\n",
-                        err);
+                nilfs_msg(nilfs->ns_sb, KERN_ERR,
+                          "unable to get checkpoint stat: err=%d", err);
                 return err;
         }
 
@@ -414,8 +414,8 @@ nilfs_segments_dirty_segments_show(struct nilfs_segments_attr *attr,
         err = nilfs_sufile_get_stat(nilfs->ns_sufile, &sustat);
         up_read(&nilfs->ns_segctor_sem);
         if (err < 0) {
-                printk(KERN_ERR "NILFS: unable to get segment stat: err=%d\n",
-                        err);
+                nilfs_msg(nilfs->ns_sb, KERN_ERR,
+                          "unable to get segment stat: err=%d", err);
                 return err;
         }
 
@@ -789,14 +789,15 @@ nilfs_superblock_sb_update_frequency_store(struct nilfs_superblock_attr *attr,
 
         err = kstrtouint(skip_spaces(buf), 0, &val);
         if (err) {
-                printk(KERN_ERR "NILFS: unable to convert string: err=%d\n",
-                        err);
+                nilfs_msg(nilfs->ns_sb, KERN_ERR,
+                          "unable to convert string: err=%d", err);
                 return err;
         }
 
         if (val < NILFS_SB_FREQ) {
                 val = NILFS_SB_FREQ;
-                printk(KERN_WARNING "NILFS: superblock update frequency cannot be lesser than 10 seconds\n");
+                nilfs_msg(nilfs->ns_sb, KERN_WARNING,
+                          "superblock update frequency cannot be lesser than 10 seconds");
         }
 
         down_write(&nilfs->ns_sem);
@@ -999,7 +1000,8 @@ int nilfs_sysfs_create_device_group(struct super_block *sb)
         nilfs->ns_dev_subgroups = kzalloc(devgrp_size, GFP_KERNEL);
         if (unlikely(!nilfs->ns_dev_subgroups)) {
                 err = -ENOMEM;
-                printk(KERN_ERR "NILFS: unable to allocate memory for device group\n");
+                nilfs_msg(sb, KERN_ERR,
+                          "unable to allocate memory for device group");
                 goto failed_create_device_group;
         }
 
@@ -1109,15 +1111,15 @@ int __init nilfs_sysfs_init(void)
         nilfs_kset = kset_create_and_add(NILFS_ROOT_GROUP_NAME, NULL, fs_kobj);
         if (!nilfs_kset) {
                 err = -ENOMEM;
-                printk(KERN_ERR "NILFS: unable to create sysfs entry: err %d\n",
-                        err);
+                nilfs_msg(NULL, KERN_ERR,
+                          "unable to create sysfs entry: err=%d", err);
                 goto failed_sysfs_init;
         }
 
         err = sysfs_create_group(&nilfs_kset->kobj, &nilfs_feature_attr_group);
         if (unlikely(err)) {
-                printk(KERN_ERR "NILFS: unable to create feature group: err %d\n",
-                        err);
+                nilfs_msg(NULL, KERN_ERR,
+                          "unable to create feature group: err=%d", err);
                 goto cleanup_sysfs_init;
         }