4 files changed, 11 insertions, 5 deletions

diff --git a/fs/configfs/configfs_internal.h b/fs/configfs/configfs_internal.h
index b5f0a3b91f18..bd4a3c167091 100644
--- a/fs/configfs/configfs_internal.h
+++ b/fs/configfs/configfs_internal.h
@@ -24,6 +24,12 @@
  * configfs Copyright (C) 2005 Oracle.  All rights reserved.
  */
 
+#ifdef pr_fmt
+#undef pr_fmt
+#endif
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/slab.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 727d06ef348c..668dcabc5695 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -1699,7 +1699,7 @@ void configfs_unregister_subsystem(struct configfs_subsystem *subsys)
         struct dentry *root = dentry->d_sb->s_root;
 
         if (dentry->d_parent != root) {
-                pr_err("configfs: Tried to unregister non-subsystem!\n");
+                pr_err("Tried to unregister non-subsystem!\n");
                 return;
         }
 
@@ -1709,7 +1709,7 @@ void configfs_unregister_subsystem(struct configfs_subsystem *subsys)
         mutex_lock(&configfs_symlink_mutex);
         spin_lock(&configfs_dirent_lock);
         if (configfs_detach_prep(dentry, NULL)) {
-                pr_err("configfs: Tried to unregister non-empty subsystem!\n");
+                pr_err("Tried to unregister non-empty subsystem!\n");
         }
         spin_unlock(&configfs_dirent_lock);
         mutex_unlock(&configfs_symlink_mutex);
diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c
index fbb30db0fce7..5946ad98053f 100644
--- a/fs/configfs/inode.c
+++ b/fs/configfs/inode.c
@@ -168,7 +168,7 @@ static void configfs_set_inode_lock_class(struct configfs_dirent *sd,
                          * In practice the maximum level of locking depth is
                          * already reached. Just inform about possible reasons.
                          */
-                        pr_info("configfs: Too many levels of inodes for the locking correctness validator.\n");
+                        pr_info("Too many levels of inodes for the locking correctness validator.\n");
                         pr_info("Spurious warnings may appear.\n");
                 }
         }
diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c
index af08de0271fe..f6c285833390 100644
--- a/fs/configfs/mount.c
+++ b/fs/configfs/mount.c
@@ -85,7 +85,7 @@ static int configfs_fill_super(struct super_block *sb, void *data, int silent)
                 /* directory inodes start off with i_nlink == 2 (for "." entry) */
                 inc_nlink(inode);
         } else {
-                pr_debug("configfs: could not get root inode\n");
+                pr_debug("could not get root inode\n");
                 return -ENOMEM;
         }
 
@@ -155,7 +155,7 @@ static int __init configfs_init(void)
 
         return 0;
 out4:
-        pr_err("configfs: Unable to register filesystem!\n");
+        pr_err("Unable to register filesystem!\n");
         configfs_inode_exit();
 out3:
         kobject_put(config_kobj);