fs/efs: add pr_fmt / use __func__

Also uniformize function arguments.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 12 insertions, 11 deletions

diff --git a/fs/efs/super.c b/fs/efs/super.c
index 059023226d55..cd1399e5fc83 100644
--- a/fs/efs/super.c
+++ b/fs/efs/super.c
@@ -134,7 +134,7 @@ static const struct export_operations efs_export_ops = {
 
 static int __init init_efs_fs(void) {
         int err;
-        pr_info("EFS: "EFS_VERSION" - http://aeschi.ch.eu.org/efs/\n");
+        pr_info(EFS_VERSION" - http://aeschi.ch.eu.org/efs/\n");
         err = init_inodecache();
         if (err)
                 goto out1;
@@ -179,7 +179,7 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) {
                 csum += be32_to_cpu(cs);
         }
         if (csum) {
-                pr_warn("EFS: SGI disklabel: checksum bad, label corrupted\n");
+                pr_warn("SGI disklabel: checksum bad, label corrupted\n");
                 return 0;
         }
 
@@ -226,10 +226,10 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) {
         }
 
         if (slice == -1) {
-                pr_notice("EFS: partition table contained no EFS partitions\n");
+                pr_notice("partition table contained no EFS partitions\n");
 #ifdef DEBUG
         } else {
-                pr_info("EFS: using slice %d (type %s, offset 0x%x)\n", slice,
+                pr_info("using slice %d (type %s, offset 0x%x)\n", slice,
                         (pt_entry->pt_name) ? pt_entry->pt_name : "unknown",
                         sblock);
 #endif
@@ -267,7 +267,7 @@ static int efs_fill_super(struct super_block *s, void *d, int silent)
  
         s->s_magic              = EFS_SUPER_MAGIC;
         if (!sb_set_blocksize(s, EFS_BLOCKSIZE)) {
-                pr_err("EFS: device does not support %d byte blocks\n",
+                pr_err("device does not support %d byte blocks\n",
                         EFS_BLOCKSIZE);
                 return -EINVAL;
         }
@@ -276,7 +276,7 @@ static int efs_fill_super(struct super_block *s, void *d, int silent)
         bh = sb_bread(s, 0);
 
         if (!bh) {
-                pr_err("EFS: cannot read volume header\n");
+                pr_err("cannot read volume header\n");
                 return -EINVAL;
         }
 
@@ -294,13 +294,14 @@ static int efs_fill_super(struct super_block *s, void *d, int silent)
 
         bh = sb_bread(s, sb->fs_start + EFS_SUPER);
         if (!bh) {
-                pr_err("EFS: cannot read superblock\n");
+                pr_err("cannot read superblock\n");
                 return -EINVAL;
         }
                 
         if (efs_validate_super(sb, (struct efs_super *) bh->b_data)) {
 #ifdef DEBUG
-                pr_warn("EFS: invalid superblock at block %u\n", sb->fs_start + EFS_SUPER);
+                pr_warn("invalid superblock at block %u\n",
+                        sb->fs_start + EFS_SUPER);
 #endif
                 brelse(bh);
                 return -EINVAL;
@@ -309,7 +310,7 @@ static int efs_fill_super(struct super_block *s, void *d, int silent)
 
         if (!(s->s_flags & MS_RDONLY)) {
 #ifdef DEBUG
-                pr_info("EFS: forcing read-only mode\n");
+                pr_info("forcing read-only mode\n");
 #endif
                 s->s_flags |= MS_RDONLY;
         }
@@ -317,13 +318,13 @@ static int efs_fill_super(struct super_block *s, void *d, int silent)
         s->s_export_op = &efs_export_ops;
         root = efs_iget(s, EFS_ROOTINODE);
         if (IS_ERR(root)) {
-                pr_err("EFS: get root inode failed\n");
+                pr_err("get root inode failed\n");
                 return PTR_ERR(root);
         }
 
         s->s_root = d_make_root(root);
         if (!(s->s_root)) {
-                pr_err("EFS: get root dentry failed\n");
+                pr_err("get root dentry failed\n");
                 return -ENOMEM;
         }