jbd2: clean up how the journal device name is printed

[linux-2.6-omap-h63xx.git] / fs / ext4 / super.c

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index f58cc0309dc90b90283728e6e018e86dd2acbc12..64e1c21eb5d223c8c4b2668a93969dcb132511e9 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1476,15 +1476,9 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es,
                        EXT4_INODES_PER_GROUP(sb),
                        sbi->s_mount_opt);
 
-       if (EXT4_SB(sb)->s_journal->j_inode == NULL) {
-               char b[BDEVNAME_SIZE];
-
-               printk(KERN_INFO "EXT4 FS on %s, external journal on %s\n",
-                      sb->s_id, bdevname(EXT4_SB(sb)->s_journal->j_dev, b));
-       } else {
-               printk(KERN_INFO "EXT4 FS on %s, internal journal\n",
-                      sb->s_id);
-       }
+       printk(KERN_INFO "EXT4 FS on %s, %s journal on %s\n",
+              sb->s_id, EXT4_SB(sb)->s_journal->j_inode ? "internal" :
+              "external", EXT4_SB(sb)->s_journal->j_devname);
        return res;
 }