diff options
Diffstat (limited to 'fs/ext4/extents.c')
-rw-r--r-- | fs/ext4/extents.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 54616157c0f3..bd808915ad2f 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c | |||
@@ -440,7 +440,7 @@ static int __ext4_ext_check(const char *function, struct inode *inode, | |||
440 | return 0; | 440 | return 0; |
441 | 441 | ||
442 | corrupted: | 442 | corrupted: |
443 | ext4_error(inode->i_sb, function, | 443 | __ext4_error(inode->i_sb, function, |
444 | "bad header/extent in inode #%lu: %s - magic %x, " | 444 | "bad header/extent in inode #%lu: %s - magic %x, " |
445 | "entries %u, max %u(%u), depth %u(%u)", | 445 | "entries %u, max %u(%u), depth %u(%u)", |
446 | inode->i_ino, error_msg, le16_to_cpu(eh->eh_magic), | 446 | inode->i_ino, error_msg, le16_to_cpu(eh->eh_magic), |
@@ -1538,8 +1538,9 @@ int ext4_ext_try_to_merge(struct inode *inode, | |||
1538 | merge_done = 1; | 1538 | merge_done = 1; |
1539 | WARN_ON(eh->eh_entries == 0); | 1539 | WARN_ON(eh->eh_entries == 0); |
1540 | if (!eh->eh_entries) | 1540 | if (!eh->eh_entries) |
1541 | ext4_error(inode->i_sb, "ext4_ext_try_to_merge", | 1541 | ext4_error(inode->i_sb, |
1542 | "inode#%lu, eh->eh_entries = 0!", inode->i_ino); | 1542 | "inode#%lu, eh->eh_entries = 0!", |
1543 | inode->i_ino); | ||
1543 | } | 1544 | } |
1544 | 1545 | ||
1545 | return merge_done; | 1546 | return merge_done; |
@@ -3238,7 +3239,7 @@ int ext4_ext_get_blocks(handle_t *handle, struct inode *inode, | |||
3238 | * this is why assert can't be put in ext4_ext_find_extent() | 3239 | * this is why assert can't be put in ext4_ext_find_extent() |
3239 | */ | 3240 | */ |
3240 | if (path[depth].p_ext == NULL && depth != 0) { | 3241 | if (path[depth].p_ext == NULL && depth != 0) { |
3241 | ext4_error(inode->i_sb, __func__, "bad extent address " | 3242 | ext4_error(inode->i_sb, "bad extent address " |
3242 | "inode: %lu, iblock: %d, depth: %d", | 3243 | "inode: %lu, iblock: %d, depth: %d", |
3243 | inode->i_ino, iblock, depth); | 3244 | inode->i_ino, iblock, depth); |
3244 | err = -EIO; | 3245 | err = -EIO; |