aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/extents.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext4/extents.c')
-rw-r--r--fs/ext4/extents.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index d6801eb7232b..91c3873970e4 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -439,10 +439,10 @@ static int __ext4_ext_check(const char *function, struct inode *inode,
439 return 0; 439 return 0;
440 440
441corrupted: 441corrupted:
442 __ext4_error(inode->i_sb, function, 442 ext4_error_inode(function, inode,
443 "bad header/extent in inode #%lu: %s - magic %x, " 443 "bad header/extent: %s - magic %x, "
444 "entries %u, max %u(%u), depth %u(%u)", 444 "entries %u, max %u(%u), depth %u(%u)",
445 inode->i_ino, error_msg, le16_to_cpu(eh->eh_magic), 445 error_msg, le16_to_cpu(eh->eh_magic),
446 le16_to_cpu(eh->eh_entries), le16_to_cpu(eh->eh_max), 446 le16_to_cpu(eh->eh_entries), le16_to_cpu(eh->eh_max),
447 max, le16_to_cpu(eh->eh_depth), depth); 447 max, le16_to_cpu(eh->eh_depth), depth);
448 448
@@ -1622,9 +1622,7 @@ int ext4_ext_try_to_merge(struct inode *inode,
1622 merge_done = 1; 1622 merge_done = 1;
1623 WARN_ON(eh->eh_entries == 0); 1623 WARN_ON(eh->eh_entries == 0);
1624 if (!eh->eh_entries) 1624 if (!eh->eh_entries)
1625 ext4_error(inode->i_sb, 1625 EXT4_ERROR_INODE(inode, "eh->eh_entries = 0!");
1626 "inode#%lu, eh->eh_entries = 0!",
1627 inode->i_ino);
1628 } 1626 }
1629 1627
1630 return merge_done; 1628 return merge_done;