1 files changed, 21 insertions, 10 deletions

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 25b1f0374f01..11dfaad232cf 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -515,11 +515,16 @@ void ext4_error_inode(struct inode *inode, const char *function,
         va_start(args, fmt);
         vaf.fmt = fmt;
         vaf.va = &args;
-        printk(KERN_CRIT "EXT4-fs error (device %s): %s:%d: inode #%lu: ",
-               inode->i_sb->s_id, function, line, inode->i_ino);
         if (block)
-                printk(KERN_CONT "block %llu: ", block);
-        printk(KERN_CONT "comm %s: %pV\n", current->comm, &vaf);
+                printk(KERN_CRIT "EXT4-fs error (device %s): %s:%d: "
+                       "inode #%lu: block %llu: comm %s: %pV\n",
+                       inode->i_sb->s_id, function, line, inode->i_ino,
+                       block, current->comm, &vaf);
+        else
+                printk(KERN_CRIT "EXT4-fs error (device %s): %s:%d: "
+                       "inode #%lu: comm %s: %pV\n",
+                       inode->i_sb->s_id, function, line, inode->i_ino,
+                       current->comm, &vaf);
         va_end(args);
 
         ext4_handle_error(inode->i_sb);
@@ -541,15 +546,21 @@ void ext4_error_file(struct file *file, const char *function,
         path = d_path(&(file->f_path), pathname, sizeof(pathname));
         if (IS_ERR(path))
                 path = "(unknown)";
-        printk(KERN_CRIT
-               "EXT4-fs error (device %s): %s:%d: inode #%lu: ",
-               inode->i_sb->s_id, function, line, inode->i_ino);
-        if (block)
-                printk(KERN_CONT "block %llu: ", block);
         va_start(args, fmt);
         vaf.fmt = fmt;
         vaf.va = &args;
-        printk(KERN_CONT "comm %s: path %s: %pV\n", current->comm, path, &vaf);
+        if (block)
+                printk(KERN_CRIT
+                       "EXT4-fs error (device %s): %s:%d: inode #%lu: "
+                       "block %llu: comm %s: path %s: %pV\n",
+                       inode->i_sb->s_id, function, line, inode->i_ino,
+                       block, current->comm, path, &vaf);
+        else
+                printk(KERN_CRIT
+                       "EXT4-fs error (device %s): %s:%d: inode #%lu: "
+                       "comm %s: path %s: %pV\n",
+                       inode->i_sb->s_id, function, line, inode->i_ino,
+                       current->comm, path, &vaf);
         va_end(args);
 
         ext4_handle_error(inode->i_sb);