[PATCH 2/3] FS/SYSV: add SysV FS: pr_fmt in sysv.h

[Fabian Frederick]

Prefix is now defined only once.
Note that all pr_foo() are now prefixed.

Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx>
---
 fs/sysv/super.c | 8 ++++----
 fs/sysv/sysv.h  | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/fs/sysv/super.c b/fs/sysv/super.c
index ef3141e..20b70bd 100644
--- a/fs/sysv/super.c
+++ b/fs/sysv/super.c
@@ -217,7 +217,7 @@ static int detect_sysv(struct sysv_sb_info *sbi, struct buffer_head *bh)
  		sbi->s_type = FSTYPE_AFS;
 		sbi->s_forced_ro = 1;
  		if (!(sb->s_flags & MS_RDONLY)) {
-			pr_err("SysV FS: SCO EAFS on %s detected, forcing read-only mode.\n",
+			pr_err("SCO EAFS on %s detected, forcing read-only mode.\n",
 			       sb->s_id);
  		}
  		return type;
@@ -239,7 +239,7 @@ static int detect_sysv(struct sysv_sb_info *sbi, struct buffer_head *bh)
            feature read-only mode seems to be a reasonable approach... -KGB */
 
 	if (type >= 0x10) {
-		pr_err("SysV FS: can't handle long file names on %s, forcing read-only mode.\n",
+		pr_err("can't handle long file names on %s, forcing read-only mode.\n",
 		       sb->s_id);
 		sbi->s_forced_ro = 1;
 	}
@@ -337,12 +337,12 @@ static int complete_read_super(struct super_block *sb, int silent, int size)
 		sb->s_d_op = &sysv_dentry_operations;
 	root_inode = sysv_iget(sb, SYSV_ROOT_INO);
 	if (IS_ERR(root_inode)) {
-		pr_err("SysV FS: get root inode failed\n");
+		pr_err("get root inode failed\n");
 		return 0;
 	}
 	sb->s_root = d_make_root(root_inode);
 	if (!sb->s_root) {
-		pr_err("SysV FS: get root dentry failed\n");
+		pr_err("get root dentry failed\n");
 		return 0;
 	}
 	return 1;
diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
index 69d4889..d35badb 100644
--- a/fs/sysv/sysv.h
+++ b/fs/sysv/sysv.h
@@ -1,6 +1,12 @@
 #ifndef _SYSV_H
 #define _SYSV_H
 
+#ifdef pr_fmt
+#undef pr_fmt
+#endif
+
+#define pr_fmt(fmt) "SysV FS: " fmt
+
 #include <linux/buffer_head.h>
 
 typedef __u16 __bitwise __fs16;
-- 
1.8.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/