hfs/hfsplus: convert printks to pr_<level>

Use a more current logging style.

Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
hfsplus now uses "hfsplus: " for all messages.
Coalesce formats.
Prefix debugging messages too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Vyacheslav Dubeyko <slava@dubeyko.com>
Cc: Hin-Tak Leung <htl10@users.sourceforge.net>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 21 insertions, 22 deletions

diff --git a/fs/hfs/super.c b/fs/hfs/super.c
index 719760b2b0a6..2d2039e754cd 100644
--- a/fs/hfs/super.c
+++ b/fs/hfs/super.c
@@ -117,12 +117,11 @@ static int hfs_remount(struct super_block *sb, int *flags, char *data)
                 return 0;
         if (!(*flags & MS_RDONLY)) {
                 if (!(HFS_SB(sb)->mdb->drAtrb & cpu_to_be16(HFS_SB_ATTRIB_UNMNT))) {
-                        printk(KERN_WARNING "hfs: filesystem was not cleanly unmounted, "
-                               "running fsck.hfs is recommended.  leaving read-only.\n");
+                        pr_warn("filesystem was not cleanly unmounted, running fsck.hfs is recommended.  leaving read-only.\n");
                         sb->s_flags |= MS_RDONLY;
                         *flags |= MS_RDONLY;
                 } else if (HFS_SB(sb)->mdb->drAtrb & cpu_to_be16(HFS_SB_ATTRIB_SLOCK)) {
-                        printk(KERN_WARNING "hfs: filesystem is marked locked, leaving read-only.\n");
+                        pr_warn("filesystem is marked locked, leaving read-only.\n");
                         sb->s_flags |= MS_RDONLY;
                         *flags |= MS_RDONLY;
                 }
@@ -253,29 +252,29 @@ static int parse_options(char *options, struct hfs_sb_info *hsb)
                 switch (token) {
                 case opt_uid:
                         if (match_int(&args[0], &tmp)) {
-                                printk(KERN_ERR "hfs: uid requires an argument\n");
+                                pr_err("uid requires an argument\n");
                                 return 0;
                         }
                         hsb->s_uid = make_kuid(current_user_ns(), (uid_t)tmp);
                         if (!uid_valid(hsb->s_uid)) {
-                                printk(KERN_ERR "hfs: invalid uid %d\n", tmp);
+                                pr_err("invalid uid %d\n", tmp);
                                 return 0;
                         }
                         break;
                 case opt_gid:
                         if (match_int(&args[0], &tmp)) {
-                                printk(KERN_ERR "hfs: gid requires an argument\n");
+                                pr_err("gid requires an argument\n");
                                 return 0;
                         }
                         hsb->s_gid = make_kgid(current_user_ns(), (gid_t)tmp);
                         if (!gid_valid(hsb->s_gid)) {
-                                printk(KERN_ERR "hfs: invalid gid %d\n", tmp);
+                                pr_err("invalid gid %d\n", tmp);
                                 return 0;
                         }
                         break;
                 case opt_umask:
                         if (match_octal(&args[0], &tmp)) {
-                                printk(KERN_ERR "hfs: umask requires a value\n");
+                                pr_err("umask requires a value\n");
                                 return 0;
                         }
                         hsb->s_file_umask = (umode_t)tmp;
@@ -283,39 +282,39 @@ static int parse_options(char *options, struct hfs_sb_info *hsb)
                         break;
                 case opt_file_umask:
                         if (match_octal(&args[0], &tmp)) {
-                                printk(KERN_ERR "hfs: file_umask requires a value\n");
+                                pr_err("file_umask requires a value\n");
                                 return 0;
                         }
                         hsb->s_file_umask = (umode_t)tmp;
                         break;
                 case opt_dir_umask:
                         if (match_octal(&args[0], &tmp)) {
-                                printk(KERN_ERR "hfs: dir_umask requires a value\n");
+                                pr_err("dir_umask requires a value\n");
                                 return 0;
                         }
                         hsb->s_dir_umask = (umode_t)tmp;
                         break;
                 case opt_part:
                         if (match_int(&args[0], &hsb->part)) {
-                                printk(KERN_ERR "hfs: part requires an argument\n");
+                                pr_err("part requires an argument\n");
                                 return 0;
                         }
                         break;
                 case opt_session:
                         if (match_int(&args[0], &hsb->session)) {
-                                printk(KERN_ERR "hfs: session requires an argument\n");
+                                pr_err("session requires an argument\n");
                                 return 0;
                         }
                         break;
                 case opt_type:
                         if (match_fourchar(&args[0], &hsb->s_type)) {
-                                printk(KERN_ERR "hfs: type requires a 4 character value\n");
+                                pr_err("type requires a 4 character value\n");
                                 return 0;
                         }
                         break;
                 case opt_creator:
                         if (match_fourchar(&args[0], &hsb->s_creator)) {
-                                printk(KERN_ERR "hfs: creator requires a 4 character value\n");
+                                pr_err("creator requires a 4 character value\n");
                                 return 0;
                         }
                         break;
@@ -324,14 +323,14 @@ static int parse_options(char *options, struct hfs_sb_info *hsb)
                         break;
                 case opt_codepage:
                         if (hsb->nls_disk) {
-                                printk(KERN_ERR "hfs: unable to change codepage\n");
+                                pr_err("unable to change codepage\n");
                                 return 0;
                         }
                         p = match_strdup(&args[0]);
                         if (p)
                                 hsb->nls_disk = load_nls(p);
                         if (!hsb->nls_disk) {
-                                printk(KERN_ERR "hfs: unable to load codepage \"%s\"\n", p);
+                                pr_err("unable to load codepage \"%s\"\n", p);
                                 kfree(p);
                                 return 0;
                         }
@@ -339,14 +338,14 @@ static int parse_options(char *options, struct hfs_sb_info *hsb)
                         break;
                 case opt_iocharset:
                         if (hsb->nls_io) {
-                                printk(KERN_ERR "hfs: unable to change iocharset\n");
+                                pr_err("unable to change iocharset\n");
                                 return 0;
                         }
                         p = match_strdup(&args[0]);
                         if (p)
                                 hsb->nls_io = load_nls(p);
                         if (!hsb->nls_io) {
-                                printk(KERN_ERR "hfs: unable to load iocharset \"%s\"\n", p);
+                                pr_err("unable to load iocharset \"%s\"\n", p);
                                 kfree(p);
                                 return 0;
                         }
@@ -360,7 +359,7 @@ static int parse_options(char *options, struct hfs_sb_info *hsb)
         if (hsb->nls_disk && !hsb->nls_io) {
                 hsb->nls_io = load_nls_default();
                 if (!hsb->nls_io) {
-                        printk(KERN_ERR "hfs: unable to load default iocharset\n");
+                        pr_err("unable to load default iocharset\n");
                         return 0;
                 }
         }
@@ -400,7 +399,7 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
 
         res = -EINVAL;
         if (!parse_options((char *)data, sbi)) {
-                printk(KERN_ERR "hfs: unable to parse mount options.\n");
+                pr_err("unable to parse mount options\n");
                 goto bail;
         }
 
@@ -411,7 +410,7 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
         res = hfs_mdb_get(sb);
         if (res) {
                 if (!silent)
-                        printk(KERN_WARNING "hfs: can't find a HFS filesystem on dev %s.\n",
+                        pr_warn("can't find a HFS filesystem on dev %s\n",
                                 hfs_mdb_name(sb));
                 res = -EINVAL;
                 goto bail;
@@ -449,7 +448,7 @@ static int hfs_fill_super(struct super_block *sb, void *data, int silent)
         return 0;
 
 bail_no_root:
-        printk(KERN_ERR "hfs: get root inode failed.\n");
+        pr_err("get root inode failed\n");
 bail:
         hfs_mdb_put(sb);
         return res;