aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/ialloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext4/ialloc.c')
-rw-r--r--fs/ext4/ialloc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index e8d24f24f282..a86377401ff0 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -75,7 +75,7 @@ unsigned ext4_init_inode_bitmap(struct super_block *sb, struct buffer_head *bh,
75 /* If checksum is bad mark all blocks and inodes use to prevent 75 /* If checksum is bad mark all blocks and inodes use to prevent
76 * allocation, essentially implementing a per-group read-only flag. */ 76 * allocation, essentially implementing a per-group read-only flag. */
77 if (!ext4_group_desc_csum_verify(sbi, block_group, gdp)) { 77 if (!ext4_group_desc_csum_verify(sbi, block_group, gdp)) {
78 ext4_error(sb, __FUNCTION__, "Checksum bad for group %lu\n", 78 ext4_error(sb, __func__, "Checksum bad for group %lu\n",
79 block_group); 79 block_group);
80 gdp->bg_free_blocks_count = 0; 80 gdp->bg_free_blocks_count = 0;
81 gdp->bg_free_inodes_count = 0; 81 gdp->bg_free_inodes_count = 0;
@@ -586,7 +586,7 @@ got:
586 ino++; 586 ino++;
587 if ((group == 0 && ino < EXT4_FIRST_INO(sb)) || 587 if ((group == 0 && ino < EXT4_FIRST_INO(sb)) ||
588 ino > EXT4_INODES_PER_GROUP(sb)) { 588 ino > EXT4_INODES_PER_GROUP(sb)) {
589 ext4_error(sb, __FUNCTION__, 589 ext4_error(sb, __func__,
590 "reserved inode or inode > inodes count - " 590 "reserved inode or inode > inodes count - "
591 "block_group = %lu, inode=%lu", group, 591 "block_group = %lu, inode=%lu", group,
592 ino + group * EXT4_INODES_PER_GROUP(sb)); 592 ino + group * EXT4_INODES_PER_GROUP(sb));
@@ -792,7 +792,7 @@ struct inode *ext4_orphan_get(struct super_block *sb, unsigned long ino)
792 792
793 /* Error cases - e2fsck has already cleaned up for us */ 793 /* Error cases - e2fsck has already cleaned up for us */
794 if (ino > max_ino) { 794 if (ino > max_ino) {
795 ext4_warning(sb, __FUNCTION__, 795 ext4_warning(sb, __func__,
796 "bad orphan ino %lu! e2fsck was run?", ino); 796 "bad orphan ino %lu! e2fsck was run?", ino);
797 goto error; 797 goto error;
798 } 798 }
@@ -801,7 +801,7 @@ struct inode *ext4_orphan_get(struct super_block *sb, unsigned long ino)
801 bit = (ino - 1) % EXT4_INODES_PER_GROUP(sb); 801 bit = (ino - 1) % EXT4_INODES_PER_GROUP(sb);
802 bitmap_bh = read_inode_bitmap(sb, block_group); 802 bitmap_bh = read_inode_bitmap(sb, block_group);
803 if (!bitmap_bh) { 803 if (!bitmap_bh) {
804 ext4_warning(sb, __FUNCTION__, 804 ext4_warning(sb, __func__,
805 "inode bitmap error for orphan %lu", ino); 805 "inode bitmap error for orphan %lu", ino);
806 goto error; 806 goto error;
807 } 807 }
@@ -826,7 +826,7 @@ iget_failed:
826 err = PTR_ERR(inode); 826 err = PTR_ERR(inode);
827 inode = NULL; 827 inode = NULL;
828bad_orphan: 828bad_orphan:
829 ext4_warning(sb, __FUNCTION__, 829 ext4_warning(sb, __func__,
830 "bad orphan inode %lu! e2fsck was run?", ino); 830 "bad orphan inode %lu! e2fsck was run?", ino);
831 printk(KERN_NOTICE "ext4_test_bit(bit=%d, block=%llu) = %d\n", 831 printk(KERN_NOTICE "ext4_test_bit(bit=%d, block=%llu) = %d\n",
832 bit, (unsigned long long)bitmap_bh->b_blocknr, 832 bit, (unsigned long long)bitmap_bh->b_blocknr,