diff options
author | Glauber de Oliveira Costa <glommer@br.ibm.com> | 2006-01-08 04:03:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 23:13:56 -0500 |
commit | 9f40668d7d14d4d16cedc2104bfb63a43584dacf (patch) | |
tree | 1afa0f60acfcfb89e460feca6ea4d5686b192915 | |
parent | 25ab7cd84eebdc1869d236029ada3a7b403de8ba (diff) |
[PATCH] ext3: remove trailing newlines from ext3_warning() calls
Remove the trailing newlines in calls to ext3_warning(). This function
already adds a trailing newline to the end of messages.
Signed-off-by: Glauber de Oliveira Costa <glommer@br.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | fs/ext3/ialloc.c | 6 | ||||
-rw-r--r-- | fs/ext3/namei.c | 2 | ||||
-rw-r--r-- | fs/ext3/resize.c | 22 |
3 files changed, 15 insertions, 15 deletions
diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c index 9e4a24376210..69078079b19c 100644 --- a/fs/ext3/ialloc.c +++ b/fs/ext3/ialloc.c | |||
@@ -651,7 +651,7 @@ struct inode *ext3_orphan_get(struct super_block *sb, unsigned long ino) | |||
651 | /* Error cases - e2fsck has already cleaned up for us */ | 651 | /* Error cases - e2fsck has already cleaned up for us */ |
652 | if (ino > max_ino) { | 652 | if (ino > max_ino) { |
653 | ext3_warning(sb, __FUNCTION__, | 653 | ext3_warning(sb, __FUNCTION__, |
654 | "bad orphan ino %lu! e2fsck was run?\n", ino); | 654 | "bad orphan ino %lu! e2fsck was run?", ino); |
655 | goto out; | 655 | goto out; |
656 | } | 656 | } |
657 | 657 | ||
@@ -660,7 +660,7 @@ struct inode *ext3_orphan_get(struct super_block *sb, unsigned long ino) | |||
660 | bitmap_bh = read_inode_bitmap(sb, block_group); | 660 | bitmap_bh = read_inode_bitmap(sb, block_group); |
661 | if (!bitmap_bh) { | 661 | if (!bitmap_bh) { |
662 | ext3_warning(sb, __FUNCTION__, | 662 | ext3_warning(sb, __FUNCTION__, |
663 | "inode bitmap error for orphan %lu\n", ino); | 663 | "inode bitmap error for orphan %lu", ino); |
664 | goto out; | 664 | goto out; |
665 | } | 665 | } |
666 | 666 | ||
@@ -672,7 +672,7 @@ struct inode *ext3_orphan_get(struct super_block *sb, unsigned long ino) | |||
672 | !(inode = iget(sb, ino)) || is_bad_inode(inode) || | 672 | !(inode = iget(sb, ino)) || is_bad_inode(inode) || |
673 | NEXT_ORPHAN(inode) > max_ino) { | 673 | NEXT_ORPHAN(inode) > max_ino) { |
674 | ext3_warning(sb, __FUNCTION__, | 674 | ext3_warning(sb, __FUNCTION__, |
675 | "bad orphan inode %lu! e2fsck was run?\n", ino); | 675 | "bad orphan inode %lu! e2fsck was run?", ino); |
676 | printk(KERN_NOTICE "ext3_test_bit(bit=%d, block=%llu) = %d\n", | 676 | printk(KERN_NOTICE "ext3_test_bit(bit=%d, block=%llu) = %d\n", |
677 | bit, (unsigned long long)bitmap_bh->b_blocknr, | 677 | bit, (unsigned long long)bitmap_bh->b_blocknr, |
678 | ext3_test_bit(bit, bitmap_bh->b_data)); | 678 | ext3_test_bit(bit, bitmap_bh->b_data)); |
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c index b3c690a3b54a..af193a304ee5 100644 --- a/fs/ext3/namei.c +++ b/fs/ext3/namei.c | |||
@@ -1476,7 +1476,7 @@ static int ext3_dx_add_entry(handle_t *handle, struct dentry *dentry, | |||
1476 | if (levels && (dx_get_count(frames->entries) == | 1476 | if (levels && (dx_get_count(frames->entries) == |
1477 | dx_get_limit(frames->entries))) { | 1477 | dx_get_limit(frames->entries))) { |
1478 | ext3_warning(sb, __FUNCTION__, | 1478 | ext3_warning(sb, __FUNCTION__, |
1479 | "Directory index full!\n"); | 1479 | "Directory index full!"); |
1480 | err = -ENOSPC; | 1480 | err = -ENOSPC; |
1481 | goto cleanup; | 1481 | goto cleanup; |
1482 | } | 1482 | } |
diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c index 6104ad310507..675aa24b0059 100644 --- a/fs/ext3/resize.c +++ b/fs/ext3/resize.c | |||
@@ -340,7 +340,7 @@ static int verify_reserved_gdb(struct super_block *sb, | |||
340 | while ((grp = ext3_list_backups(sb, &three, &five, &seven)) < end) { | 340 | while ((grp = ext3_list_backups(sb, &three, &five, &seven)) < end) { |
341 | if (le32_to_cpu(*p++) != grp * EXT3_BLOCKS_PER_GROUP(sb) + blk){ | 341 | if (le32_to_cpu(*p++) != grp * EXT3_BLOCKS_PER_GROUP(sb) + blk){ |
342 | ext3_warning(sb, __FUNCTION__, | 342 | ext3_warning(sb, __FUNCTION__, |
343 | "reserved GDT %ld missing grp %d (%ld)\n", | 343 | "reserved GDT %ld missing grp %d (%ld)", |
344 | blk, grp, | 344 | blk, grp, |
345 | grp * EXT3_BLOCKS_PER_GROUP(sb) + blk); | 345 | grp * EXT3_BLOCKS_PER_GROUP(sb) + blk); |
346 | return -EINVAL; | 346 | return -EINVAL; |
@@ -393,7 +393,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode, | |||
393 | if (EXT3_SB(sb)->s_sbh->b_blocknr != | 393 | if (EXT3_SB(sb)->s_sbh->b_blocknr != |
394 | le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block)) { | 394 | le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block)) { |
395 | ext3_warning(sb, __FUNCTION__, | 395 | ext3_warning(sb, __FUNCTION__, |
396 | "won't resize using backup superblock at %llu\n", | 396 | "won't resize using backup superblock at %llu", |
397 | (unsigned long long)EXT3_SB(sb)->s_sbh->b_blocknr); | 397 | (unsigned long long)EXT3_SB(sb)->s_sbh->b_blocknr); |
398 | return -EPERM; | 398 | return -EPERM; |
399 | } | 399 | } |
@@ -417,7 +417,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode, | |||
417 | data = (__u32 *)dind->b_data; | 417 | data = (__u32 *)dind->b_data; |
418 | if (le32_to_cpu(data[gdb_num % EXT3_ADDR_PER_BLOCK(sb)]) != gdblock) { | 418 | if (le32_to_cpu(data[gdb_num % EXT3_ADDR_PER_BLOCK(sb)]) != gdblock) { |
419 | ext3_warning(sb, __FUNCTION__, | 419 | ext3_warning(sb, __FUNCTION__, |
420 | "new group %u GDT block %lu not reserved\n", | 420 | "new group %u GDT block %lu not reserved", |
421 | input->group, gdblock); | 421 | input->group, gdblock); |
422 | err = -EINVAL; | 422 | err = -EINVAL; |
423 | goto exit_dind; | 423 | goto exit_dind; |
@@ -540,7 +540,7 @@ static int reserve_backup_gdb(handle_t *handle, struct inode *inode, | |||
540 | for (res = 0; res < reserved_gdb; res++, blk++) { | 540 | for (res = 0; res < reserved_gdb; res++, blk++) { |
541 | if (le32_to_cpu(*data) != blk) { | 541 | if (le32_to_cpu(*data) != blk) { |
542 | ext3_warning(sb, __FUNCTION__, | 542 | ext3_warning(sb, __FUNCTION__, |
543 | "reserved block %lu not at offset %ld\n", | 543 | "reserved block %lu not at offset %ld", |
544 | blk, (long)(data - (__u32 *)dind->b_data)); | 544 | blk, (long)(data - (__u32 *)dind->b_data)); |
545 | err = -EINVAL; | 545 | err = -EINVAL; |
546 | goto exit_bh; | 546 | goto exit_bh; |
@@ -683,7 +683,7 @@ exit_err: | |||
683 | if (err) { | 683 | if (err) { |
684 | ext3_warning(sb, __FUNCTION__, | 684 | ext3_warning(sb, __FUNCTION__, |
685 | "can't update backup for group %d (err %d), " | 685 | "can't update backup for group %d (err %d), " |
686 | "forcing fsck on next reboot\n", group, err); | 686 | "forcing fsck on next reboot", group, err); |
687 | sbi->s_mount_state &= ~EXT3_VALID_FS; | 687 | sbi->s_mount_state &= ~EXT3_VALID_FS; |
688 | sbi->s_es->s_state &= ~cpu_to_le16(EXT3_VALID_FS); | 688 | sbi->s_es->s_state &= ~cpu_to_le16(EXT3_VALID_FS); |
689 | mark_buffer_dirty(sbi->s_sbh); | 689 | mark_buffer_dirty(sbi->s_sbh); |
@@ -722,7 +722,7 @@ int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input) | |||
722 | if (gdb_off == 0 && !EXT3_HAS_RO_COMPAT_FEATURE(sb, | 722 | if (gdb_off == 0 && !EXT3_HAS_RO_COMPAT_FEATURE(sb, |
723 | EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER)) { | 723 | EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER)) { |
724 | ext3_warning(sb, __FUNCTION__, | 724 | ext3_warning(sb, __FUNCTION__, |
725 | "Can't resize non-sparse filesystem further\n"); | 725 | "Can't resize non-sparse filesystem further"); |
726 | return -EPERM; | 726 | return -EPERM; |
727 | } | 727 | } |
728 | 728 | ||
@@ -730,13 +730,13 @@ int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input) | |||
730 | if (!EXT3_HAS_COMPAT_FEATURE(sb, | 730 | if (!EXT3_HAS_COMPAT_FEATURE(sb, |
731 | EXT3_FEATURE_COMPAT_RESIZE_INODE)){ | 731 | EXT3_FEATURE_COMPAT_RESIZE_INODE)){ |
732 | ext3_warning(sb, __FUNCTION__, | 732 | ext3_warning(sb, __FUNCTION__, |
733 | "No reserved GDT blocks, can't resize\n"); | 733 | "No reserved GDT blocks, can't resize"); |
734 | return -EPERM; | 734 | return -EPERM; |
735 | } | 735 | } |
736 | inode = iget(sb, EXT3_RESIZE_INO); | 736 | inode = iget(sb, EXT3_RESIZE_INO); |
737 | if (!inode || is_bad_inode(inode)) { | 737 | if (!inode || is_bad_inode(inode)) { |
738 | ext3_warning(sb, __FUNCTION__, | 738 | ext3_warning(sb, __FUNCTION__, |
739 | "Error opening resize inode\n"); | 739 | "Error opening resize inode"); |
740 | iput(inode); | 740 | iput(inode); |
741 | return -ENOENT; | 741 | return -ENOENT; |
742 | } | 742 | } |
@@ -766,7 +766,7 @@ int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input) | |||
766 | lock_super(sb); | 766 | lock_super(sb); |
767 | if (input->group != EXT3_SB(sb)->s_groups_count) { | 767 | if (input->group != EXT3_SB(sb)->s_groups_count) { |
768 | ext3_warning(sb, __FUNCTION__, | 768 | ext3_warning(sb, __FUNCTION__, |
769 | "multiple resizers run on filesystem!\n"); | 769 | "multiple resizers run on filesystem!"); |
770 | err = -EBUSY; | 770 | err = -EBUSY; |
771 | goto exit_journal; | 771 | goto exit_journal; |
772 | } | 772 | } |
@@ -937,7 +937,7 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es, | |||
937 | 937 | ||
938 | if (last == 0) { | 938 | if (last == 0) { |
939 | ext3_warning(sb, __FUNCTION__, | 939 | ext3_warning(sb, __FUNCTION__, |
940 | "need to use ext2online to resize further\n"); | 940 | "need to use ext2online to resize further"); |
941 | return -EPERM; | 941 | return -EPERM; |
942 | } | 942 | } |
943 | 943 | ||
@@ -973,7 +973,7 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es, | |||
973 | lock_super(sb); | 973 | lock_super(sb); |
974 | if (o_blocks_count != le32_to_cpu(es->s_blocks_count)) { | 974 | if (o_blocks_count != le32_to_cpu(es->s_blocks_count)) { |
975 | ext3_warning(sb, __FUNCTION__, | 975 | ext3_warning(sb, __FUNCTION__, |
976 | "multiple resizers run on filesystem!\n"); | 976 | "multiple resizers run on filesystem!"); |
977 | err = -EBUSY; | 977 | err = -EBUSY; |
978 | goto exit_put; | 978 | goto exit_put; |
979 | } | 979 | } |