diff options
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r-- | fs/ext4/super.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index da377f9521bb..8fa57be5040a 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -1470,7 +1470,7 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es, | |||
1470 | 1470 | ||
1471 | ext4_commit_super(sb, es, 1); | 1471 | ext4_commit_super(sb, es, 1); |
1472 | if (test_opt(sb, DEBUG)) | 1472 | if (test_opt(sb, DEBUG)) |
1473 | printk(KERN_INFO "[EXT4 FS bs=%lu, gc=%lu, " | 1473 | printk(KERN_INFO "[EXT4 FS bs=%lu, gc=%u, " |
1474 | "bpg=%lu, ipg=%lu, mo=%04lx]\n", | 1474 | "bpg=%lu, ipg=%lu, mo=%04lx]\n", |
1475 | sb->s_blocksize, | 1475 | sb->s_blocksize, |
1476 | sbi->s_groups_count, | 1476 | sbi->s_groups_count, |
@@ -1514,7 +1514,7 @@ static int ext4_fill_flex_info(struct super_block *sb) | |||
1514 | sizeof(struct flex_groups), GFP_KERNEL); | 1514 | sizeof(struct flex_groups), GFP_KERNEL); |
1515 | if (sbi->s_flex_groups == NULL) { | 1515 | if (sbi->s_flex_groups == NULL) { |
1516 | printk(KERN_ERR "EXT4-fs: not enough memory for " | 1516 | printk(KERN_ERR "EXT4-fs: not enough memory for " |
1517 | "%lu flex groups\n", flex_group_count); | 1517 | "%u flex groups\n", flex_group_count); |
1518 | goto failed; | 1518 | goto failed; |
1519 | } | 1519 | } |
1520 | 1520 | ||
@@ -1599,14 +1599,14 @@ static int ext4_check_descriptors(struct super_block *sb) | |||
1599 | block_bitmap = ext4_block_bitmap(sb, gdp); | 1599 | block_bitmap = ext4_block_bitmap(sb, gdp); |
1600 | if (block_bitmap < first_block || block_bitmap > last_block) { | 1600 | if (block_bitmap < first_block || block_bitmap > last_block) { |
1601 | printk(KERN_ERR "EXT4-fs: ext4_check_descriptors: " | 1601 | printk(KERN_ERR "EXT4-fs: ext4_check_descriptors: " |
1602 | "Block bitmap for group %lu not in group " | 1602 | "Block bitmap for group %u not in group " |
1603 | "(block %llu)!\n", i, block_bitmap); | 1603 | "(block %llu)!\n", i, block_bitmap); |
1604 | return 0; | 1604 | return 0; |
1605 | } | 1605 | } |
1606 | inode_bitmap = ext4_inode_bitmap(sb, gdp); | 1606 | inode_bitmap = ext4_inode_bitmap(sb, gdp); |
1607 | if (inode_bitmap < first_block || inode_bitmap > last_block) { | 1607 | if (inode_bitmap < first_block || inode_bitmap > last_block) { |
1608 | printk(KERN_ERR "EXT4-fs: ext4_check_descriptors: " | 1608 | printk(KERN_ERR "EXT4-fs: ext4_check_descriptors: " |
1609 | "Inode bitmap for group %lu not in group " | 1609 | "Inode bitmap for group %u not in group " |
1610 | "(block %llu)!\n", i, inode_bitmap); | 1610 | "(block %llu)!\n", i, inode_bitmap); |
1611 | return 0; | 1611 | return 0; |
1612 | } | 1612 | } |
@@ -1614,14 +1614,14 @@ static int ext4_check_descriptors(struct super_block *sb) | |||
1614 | if (inode_table < first_block || | 1614 | if (inode_table < first_block || |
1615 | inode_table + sbi->s_itb_per_group - 1 > last_block) { | 1615 | inode_table + sbi->s_itb_per_group - 1 > last_block) { |
1616 | printk(KERN_ERR "EXT4-fs: ext4_check_descriptors: " | 1616 | printk(KERN_ERR "EXT4-fs: ext4_check_descriptors: " |
1617 | "Inode table for group %lu not in group " | 1617 | "Inode table for group %u not in group " |
1618 | "(block %llu)!\n", i, inode_table); | 1618 | "(block %llu)!\n", i, inode_table); |
1619 | return 0; | 1619 | return 0; |
1620 | } | 1620 | } |
1621 | spin_lock(sb_bgl_lock(sbi, i)); | 1621 | spin_lock(sb_bgl_lock(sbi, i)); |
1622 | if (!ext4_group_desc_csum_verify(sbi, i, gdp)) { | 1622 | if (!ext4_group_desc_csum_verify(sbi, i, gdp)) { |
1623 | printk(KERN_ERR "EXT4-fs: ext4_check_descriptors: " | 1623 | printk(KERN_ERR "EXT4-fs: ext4_check_descriptors: " |
1624 | "Checksum for group %lu failed (%u!=%u)\n", | 1624 | "Checksum for group %u failed (%u!=%u)\n", |
1625 | i, le16_to_cpu(ext4_group_desc_csum(sbi, i, | 1625 | i, le16_to_cpu(ext4_group_desc_csum(sbi, i, |
1626 | gdp)), le16_to_cpu(gdp->bg_checksum)); | 1626 | gdp)), le16_to_cpu(gdp->bg_checksum)); |
1627 | if (!(sb->s_flags & MS_RDONLY)) { | 1627 | if (!(sb->s_flags & MS_RDONLY)) { |
@@ -3154,7 +3154,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) | |||
3154 | if (!ext4_group_desc_csum_verify(sbi, g, gdp)) { | 3154 | if (!ext4_group_desc_csum_verify(sbi, g, gdp)) { |
3155 | printk(KERN_ERR | 3155 | printk(KERN_ERR |
3156 | "EXT4-fs: ext4_remount: " | 3156 | "EXT4-fs: ext4_remount: " |
3157 | "Checksum for group %lu failed (%u!=%u)\n", | 3157 | "Checksum for group %u failed (%u!=%u)\n", |
3158 | g, le16_to_cpu(ext4_group_desc_csum(sbi, g, gdp)), | 3158 | g, le16_to_cpu(ext4_group_desc_csum(sbi, g, gdp)), |
3159 | le16_to_cpu(gdp->bg_checksum)); | 3159 | le16_to_cpu(gdp->bg_checksum)); |
3160 | err = -EINVAL; | 3160 | err = -EINVAL; |