aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/mballoc.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2009-01-05 22:17:35 -0500
committerTheodore Ts'o <tytso@mit.edu>2009-01-05 22:17:35 -0500
commitfde4d95ad8711c84a36735a17136c45b19746af9 (patch)
treee4d4dcaeb18083be204ba8fe55a75400ded699ae /fs/ext4/mballoc.c
parentfd98496f467b3d26d05ab1498f41718b5ef13de5 (diff)
ext4: remove extraneous newlines from calls to ext4_error() and ext4_warning()
This removes annoying blank syslog entries emitted by ext4_error() or ext4_warning(), since these functions add their own newline. Signed-off-by: Nick Warne <nick@ukfsn.org> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/mballoc.c')
-rw-r--r--fs/ext4/mballoc.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index edb512b2ec49..48d606cd740f 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -447,7 +447,7 @@ static void mb_free_blocks_double(struct inode *inode, struct ext4_buddy *e4b,
447 le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block); 447 le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block);
448 448
449 ext4_error(sb, __func__, "double-free of inode" 449 ext4_error(sb, __func__, "double-free of inode"
450 " %lu's block %llu(bit %u in group %lu)\n", 450 " %lu's block %llu(bit %u in group %lu)",
451 inode ? inode->i_ino : 0, blocknr, 451 inode ? inode->i_ino : 0, blocknr,
452 first + i, e4b->bd_group); 452 first + i, e4b->bd_group);
453 } 453 }
@@ -691,7 +691,7 @@ static void ext4_mb_generate_buddy(struct super_block *sb,
691 691
692 if (free != grp->bb_free) { 692 if (free != grp->bb_free) {
693 ext4_error(sb, __func__, 693 ext4_error(sb, __func__,
694 "EXT4-fs: group %lu: %u blocks in bitmap, %u in gd\n", 694 "EXT4-fs: group %lu: %u blocks in bitmap, %u in gd",
695 group, free, grp->bb_free); 695 group, free, grp->bb_free);
696 /* 696 /*
697 * If we intent to continue, we consider group descritor 697 * If we intent to continue, we consider group descritor
@@ -1096,7 +1096,7 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b,
1096 le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block); 1096 le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block);
1097 ext4_unlock_group(sb, e4b->bd_group); 1097 ext4_unlock_group(sb, e4b->bd_group);
1098 ext4_error(sb, __func__, "double-free of inode" 1098 ext4_error(sb, __func__, "double-free of inode"
1099 " %lu's block %llu(bit %u in group %lu)\n", 1099 " %lu's block %llu(bit %u in group %lu)",
1100 inode ? inode->i_ino : 0, blocknr, block, 1100 inode ? inode->i_ino : 0, blocknr, block,
1101 e4b->bd_group); 1101 e4b->bd_group);
1102 ext4_lock_group(sb, e4b->bd_group); 1102 ext4_lock_group(sb, e4b->bd_group);
@@ -1576,7 +1576,7 @@ static void ext4_mb_complex_scan_group(struct ext4_allocation_context *ac,
1576 * we have free blocks 1576 * we have free blocks
1577 */ 1577 */
1578 ext4_error(sb, __func__, "%d free blocks as per " 1578 ext4_error(sb, __func__, "%d free blocks as per "
1579 "group info. But bitmap says 0\n", 1579 "group info. But bitmap says 0",
1580 free); 1580 free);
1581 break; 1581 break;
1582 } 1582 }
@@ -1585,7 +1585,7 @@ static void ext4_mb_complex_scan_group(struct ext4_allocation_context *ac,
1585 BUG_ON(ex.fe_len <= 0); 1585 BUG_ON(ex.fe_len <= 0);
1586 if (free < ex.fe_len) { 1586 if (free < ex.fe_len) {
1587 ext4_error(sb, __func__, "%d free blocks as per " 1587 ext4_error(sb, __func__, "%d free blocks as per "
1588 "group info. But got %d blocks\n", 1588 "group info. But got %d blocks",
1589 free, ex.fe_len); 1589 free, ex.fe_len);
1590 /* 1590 /*
1591 * The number of free blocks differs. This mostly 1591 * The number of free blocks differs. This mostly
@@ -3629,7 +3629,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
3629 pa, (unsigned long) pa->pa_lstart, 3629 pa, (unsigned long) pa->pa_lstart,
3630 (unsigned long) pa->pa_pstart, 3630 (unsigned long) pa->pa_pstart,
3631 (unsigned long) pa->pa_len); 3631 (unsigned long) pa->pa_len);
3632 ext4_error(sb, __func__, "free %u, pa_free %u\n", 3632 ext4_error(sb, __func__, "free %u, pa_free %u",
3633 free, pa->pa_free); 3633 free, pa->pa_free);
3634 /* 3634 /*
3635 * pa is already deleted so we use the value obtained 3635 * pa is already deleted so we use the value obtained
@@ -3703,14 +3703,14 @@ ext4_mb_discard_group_preallocations(struct super_block *sb,
3703 bitmap_bh = ext4_read_block_bitmap(sb, group); 3703 bitmap_bh = ext4_read_block_bitmap(sb, group);
3704 if (bitmap_bh == NULL) { 3704 if (bitmap_bh == NULL) {
3705 ext4_error(sb, __func__, "Error in reading block " 3705 ext4_error(sb, __func__, "Error in reading block "
3706 "bitmap for %lu\n", group); 3706 "bitmap for %lu", group);
3707 return 0; 3707 return 0;
3708 } 3708 }
3709 3709
3710 err = ext4_mb_load_buddy(sb, group, &e4b); 3710 err = ext4_mb_load_buddy(sb, group, &e4b);
3711 if (err) { 3711 if (err) {
3712 ext4_error(sb, __func__, "Error in loading buddy " 3712 ext4_error(sb, __func__, "Error in loading buddy "
3713 "information for %lu\n", group); 3713 "information for %lu", group);
3714 put_bh(bitmap_bh); 3714 put_bh(bitmap_bh);
3715 return 0; 3715 return 0;
3716 } 3716 }
@@ -3877,14 +3877,14 @@ repeat:
3877 err = ext4_mb_load_buddy(sb, group, &e4b); 3877 err = ext4_mb_load_buddy(sb, group, &e4b);
3878 if (err) { 3878 if (err) {
3879 ext4_error(sb, __func__, "Error in loading buddy " 3879 ext4_error(sb, __func__, "Error in loading buddy "
3880 "information for %lu\n", group); 3880 "information for %lu", group);
3881 continue; 3881 continue;
3882 } 3882 }
3883 3883
3884 bitmap_bh = ext4_read_block_bitmap(sb, group); 3884 bitmap_bh = ext4_read_block_bitmap(sb, group);
3885 if (bitmap_bh == NULL) { 3885 if (bitmap_bh == NULL) {
3886 ext4_error(sb, __func__, "Error in reading block " 3886 ext4_error(sb, __func__, "Error in reading block "
3887 "bitmap for %lu\n", group); 3887 "bitmap for %lu", group);
3888 ext4_mb_release_desc(&e4b); 3888 ext4_mb_release_desc(&e4b);
3889 continue; 3889 continue;
3890 } 3890 }
@@ -4149,7 +4149,7 @@ ext4_mb_discard_lg_preallocations(struct super_block *sb,
4149 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, NULL); 4149 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, NULL);
4150 if (ext4_mb_load_buddy(sb, group, &e4b)) { 4150 if (ext4_mb_load_buddy(sb, group, &e4b)) {
4151 ext4_error(sb, __func__, "Error in loading buddy " 4151 ext4_error(sb, __func__, "Error in loading buddy "
4152 "information for %lu\n", group); 4152 "information for %lu", group);
4153 continue; 4153 continue;
4154 } 4154 }
4155 ext4_lock_group(sb, group); 4155 ext4_lock_group(sb, group);
@@ -4446,7 +4446,7 @@ ext4_mb_free_metadata(handle_t *handle, struct ext4_buddy *e4b,
4446 else { 4446 else {
4447 ext4_unlock_group(sb, group); 4447 ext4_unlock_group(sb, group);
4448 ext4_error(sb, __func__, 4448 ext4_error(sb, __func__,
4449 "Double free of blocks %d (%d %d)\n", 4449 "Double free of blocks %d (%d %d)",
4450 block, entry->start_blk, entry->count); 4450 block, entry->start_blk, entry->count);
4451 return 0; 4451 return 0;
4452 } 4452 }