ext[234]: use ext[234]_get_group_desc()
Use ext[234]_get_group_desc() to get group descriptor from group number. Cc: <linux-ext4@vger.kernel.org> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
144704e522
commit
197cd65acc
@ -1252,28 +1252,24 @@ static int ext3_setup_super(struct super_block *sb, struct ext3_super_block *es,
|
||||
}
|
||||
|
||||
/* Called at mount-time, super-block is locked */
|
||||
static int ext3_check_descriptors (struct super_block * sb)
|
||||
static int ext3_check_descriptors(struct super_block *sb)
|
||||
{
|
||||
struct ext3_sb_info *sbi = EXT3_SB(sb);
|
||||
ext3_fsblk_t first_block = le32_to_cpu(sbi->s_es->s_first_data_block);
|
||||
ext3_fsblk_t last_block;
|
||||
struct ext3_group_desc * gdp = NULL;
|
||||
int desc_block = 0;
|
||||
int i;
|
||||
|
||||
ext3_debug ("Checking group descriptors");
|
||||
|
||||
for (i = 0; i < sbi->s_groups_count; i++)
|
||||
{
|
||||
for (i = 0; i < sbi->s_groups_count; i++) {
|
||||
struct ext3_group_desc *gdp = ext3_get_group_desc(sb, i, NULL);
|
||||
|
||||
if (i == sbi->s_groups_count - 1)
|
||||
last_block = le32_to_cpu(sbi->s_es->s_blocks_count) - 1;
|
||||
else
|
||||
last_block = first_block +
|
||||
(EXT3_BLOCKS_PER_GROUP(sb) - 1);
|
||||
|
||||
if ((i % EXT3_DESC_PER_BLOCK(sb)) == 0)
|
||||
gdp = (struct ext3_group_desc *)
|
||||
sbi->s_group_desc[desc_block++]->b_data;
|
||||
if (le32_to_cpu(gdp->bg_block_bitmap) < first_block ||
|
||||
le32_to_cpu(gdp->bg_block_bitmap) > last_block)
|
||||
{
|
||||
@ -1306,7 +1302,6 @@ static int ext3_check_descriptors (struct super_block * sb)
|
||||
return 0;
|
||||
}
|
||||
first_block += EXT3_BLOCKS_PER_GROUP(sb);
|
||||
gdp++;
|
||||
}
|
||||
|
||||
sbi->s_es->s_free_blocks_count=cpu_to_le32(ext3_count_free_blocks(sb));
|
||||
|
Reference in New Issue
Block a user