diff options
author | Theodore Ts'o <tytso@mit.edu> | 2012-03-19 23:13:43 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2012-03-19 23:13:43 -0400 |
commit | 1084f252e3490392575b80cbdfa1baf0842173d8 (patch) | |
tree | 063673648d6e16f6f2873bfcf99791eacadf1aec | |
parent | ace36ad431c6820c2a8718cee85e5294d6e19747 (diff) |
ext4: remove trailing newlines from ext4_msg() and ext4_error() messages
The functions ext4_msg() and ext4_error() already tack on a trailing
newline, so remove the unnecessary extra newline.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r-- | fs/ext4/ialloc.c | 6 | ||||
-rw-r--r-- | fs/ext4/inode.c | 4 | ||||
-rw-r--r-- | fs/ext4/mballoc.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index b2685992fb2d..75e2eae74cd1 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c | |||
@@ -1102,9 +1102,9 @@ int ext4_init_inode_table(struct super_block *sb, ext4_group_t group, | |||
1102 | sbi->s_inodes_per_block); | 1102 | sbi->s_inodes_per_block); |
1103 | 1103 | ||
1104 | if ((used_blks < 0) || (used_blks > sbi->s_itb_per_group)) { | 1104 | if ((used_blks < 0) || (used_blks > sbi->s_itb_per_group)) { |
1105 | ext4_error(sb, "Something is wrong with group %u\n" | 1105 | ext4_error(sb, "Something is wrong with group %u: " |
1106 | "Used itable blocks: %d" | 1106 | "used itable blocks: %d; " |
1107 | "itable unused count: %u\n", | 1107 | "itable unused count: %u", |
1108 | group, used_blks, | 1108 | group, used_blks, |
1109 | ext4_itable_unused_count(sb, gdp)); | 1109 | ext4_itable_unused_count(sb, gdp)); |
1110 | ret = 1; | 1110 | ret = 1; |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 028140213aee..a11264ebd1f3 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -272,7 +272,7 @@ void ext4_da_update_reserve_space(struct inode *inode, | |||
272 | trace_ext4_da_update_reserve_space(inode, used, quota_claim); | 272 | trace_ext4_da_update_reserve_space(inode, used, quota_claim); |
273 | if (unlikely(used > ei->i_reserved_data_blocks)) { | 273 | if (unlikely(used > ei->i_reserved_data_blocks)) { |
274 | ext4_msg(inode->i_sb, KERN_NOTICE, "%s: ino %lu, used %d " | 274 | ext4_msg(inode->i_sb, KERN_NOTICE, "%s: ino %lu, used %d " |
275 | "with only %d reserved data blocks\n", | 275 | "with only %d reserved data blocks", |
276 | __func__, inode->i_ino, used, | 276 | __func__, inode->i_ino, used, |
277 | ei->i_reserved_data_blocks); | 277 | ei->i_reserved_data_blocks); |
278 | WARN_ON(1); | 278 | WARN_ON(1); |
@@ -1165,7 +1165,7 @@ static void ext4_da_release_space(struct inode *inode, int to_free) | |||
1165 | */ | 1165 | */ |
1166 | ext4_msg(inode->i_sb, KERN_NOTICE, "ext4_da_release_space: " | 1166 | ext4_msg(inode->i_sb, KERN_NOTICE, "ext4_da_release_space: " |
1167 | "ino %lu, to_free %d with only %d reserved " | 1167 | "ino %lu, to_free %d with only %d reserved " |
1168 | "data blocks\n", inode->i_ino, to_free, | 1168 | "data blocks", inode->i_ino, to_free, |
1169 | ei->i_reserved_data_blocks); | 1169 | ei->i_reserved_data_blocks); |
1170 | WARN_ON(1); | 1170 | WARN_ON(1); |
1171 | to_free = ei->i_reserved_data_blocks; | 1171 | to_free = ei->i_reserved_data_blocks; |
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 8631e73f8f77..23ec6a879b35 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c | |||
@@ -2762,7 +2762,7 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac, | |||
2762 | len = EXT4_C2B(sbi, ac->ac_b_ex.fe_len); | 2762 | len = EXT4_C2B(sbi, ac->ac_b_ex.fe_len); |
2763 | if (!ext4_data_block_valid(sbi, block, len)) { | 2763 | if (!ext4_data_block_valid(sbi, block, len)) { |
2764 | ext4_error(sb, "Allocating blocks %llu-%llu which overlap " | 2764 | ext4_error(sb, "Allocating blocks %llu-%llu which overlap " |
2765 | "fs metadata\n", block, block+len); | 2765 | "fs metadata", block, block+len); |
2766 | /* File system mounted not to panic on error | 2766 | /* File system mounted not to panic on error |
2767 | * Fix the bitmap and repeat the block allocation | 2767 | * Fix the bitmap and repeat the block allocation |
2768 | * We leak some of the blocks here. | 2768 | * We leak some of the blocks here. |