GFS2: Use pr_<level> more consistently

[deliverable/linux.git] / fs / gfs2 / ops_fstype.c

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index ea9c35cae757abc135c3cd2e0bb1355cf6877dc1..fba74a26a6a3c97fc1a05780573aabe790f8706c 100644 (file)
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -7,6 +7,8 @@
  * of the GNU General Public License version 2.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
@@ -150,7 +152,7 @@ static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent)
        if (sb->sb_magic != GFS2_MAGIC ||
            sb->sb_type != GFS2_METATYPE_SB) {
                if (!silent)
-                       pr_warn("GFS2: not a GFS2 filesystem\n");
+                       pr_warn("not a GFS2 filesystem\n");
                return -EINVAL;
        }
 
@@ -172,7 +174,7 @@ static void end_bio_io_page(struct bio *bio, int error)
        if (!error)
                SetPageUptodate(page);
        else
-               pr_warn("gfs2: error %d reading superblock\n", error);
+               pr_warn("error %d reading superblock\n", error);
        unlock_page(page);
 }
 
@@ -945,7 +947,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent)
                lm = &gfs2_dlm_ops;
 #endif
        } else {
-               pr_info("GFS2: can't find protocol %s\n", proto);
+               pr_info("can't find protocol %s\n", proto);
                return -ENOENT;
        }
 
@@ -1052,7 +1054,7 @@ static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent
 
        sdp = init_sbd(sb);
        if (!sdp) {
-               pr_warn("GFS2: can't alloc struct gfs2_sbd\n");
+               pr_warn("can't alloc struct gfs2_sbd\n");
                return -ENOMEM;
        }
        sdp->sd_args = *args;
@@ -1300,7 +1302,7 @@ static struct dentry *gfs2_mount(struct file_system_type *fs_type, int flags,
 
        error = gfs2_mount_args(&args, data);
        if (error) {
-               pr_warn("GFS2: can't parse mount arguments\n");
+               pr_warn("can't parse mount arguments\n");
                goto error_super;
        }
 
@@ -1350,15 +1352,15 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type,
 
        error = kern_path(dev_name, LOOKUP_FOLLOW, &path);
        if (error) {
-               pr_warn("GFS2: path_lookup on %s returned error %d\n",
-                      dev_name, error);
+               pr_warn("path_lookup on %s returned error %d\n",
+                       dev_name, error);
                return ERR_PTR(error);
        }
        s = sget(&gfs2_fs_type, test_gfs2_super, set_meta_super, flags,
                 path.dentry->d_inode->i_sb->s_bdev);
        path_put(&path);
        if (IS_ERR(s)) {
-               pr_warn("GFS2: gfs2 mount does not exist\n");
+               pr_warn("gfs2 mount does not exist\n");
                return ERR_CAST(s);
        }
        if ((flags ^ s->s_flags) & MS_RDONLY) {