Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 197cd65a authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

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: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 144704e5

fs/ext2/super.c

+4 −8
Original line number Diff line number Diff line
@@ -620,24 +620,21 @@ static int ext2_setup_super (struct super_block * sb, 
static int ext2_check_descriptors(struct super_block *sb)

{

	int i;

	int desc_block = 0;

	struct ext2_sb_info *sbi = EXT2_SB(sb);

	unsigned long first_block = le32_to_cpu(sbi->s_es->s_first_data_block);

	unsigned long last_block;

	struct ext2_group_desc * gdp = NULL;



	ext2_debug ("Checking group descriptors");



	for (i = 0; i < sbi->s_groups_count; i++)

	{

	for (i = 0; i < sbi->s_groups_count; i++) {

		struct ext2_group_desc *gdp = ext2_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 +

				(EXT2_BLOCKS_PER_GROUP(sb) - 1);



		if ((i % EXT2_DESC_PER_BLOCK(sb)) == 0)

			gdp = (struct ext2_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)

		{
@@ -667,7 +664,6 @@ static int ext2_check_descriptors (struct super_block * sb) 
			return 0;

		}

		first_block += EXT2_BLOCKS_PER_GROUP(sb);

		gdp++;

	}

	return 1;

}

fs/ext3/super.c

+4 −9
Original line number Diff line number Diff line
@@ -1257,23 +1257,19 @@ 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));

fs/ext4/super.c

+4 −10
Original line number Diff line number Diff line
@@ -1466,8 +1466,6 @@ static int ext4_check_descriptors (struct super_block * sb) 
	ext4_fsblk_t block_bitmap;

	ext4_fsblk_t inode_bitmap;

	ext4_fsblk_t inode_table;

	struct ext4_group_desc * gdp = NULL;

	int desc_block = 0;

	int flexbg_flag = 0;

	ext4_group_t i;
@@ -1476,17 +1474,15 @@ static int ext4_check_descriptors (struct super_block * sb) 


	ext4_debug ("Checking group descriptors");



	for (i = 0; i < sbi->s_groups_count; i++)

	{

	for (i = 0; i < sbi->s_groups_count; i++) {

		struct ext4_group_desc *gdp = ext4_get_group_desc(sb, i, NULL);



		if (i == sbi->s_groups_count - 1 || flexbg_flag)

			last_block = ext4_blocks_count(sbi->s_es) - 1;

		else

			last_block = first_block +

				(EXT4_BLOCKS_PER_GROUP(sb) - 1);



		if ((i % EXT4_DESC_PER_BLOCK(sb)) == 0)

			gdp = (struct ext4_group_desc *)

					sbi->s_group_desc[desc_block++]->b_data;

		block_bitmap = ext4_block_bitmap(sb, gdp);

		if (block_bitmap < first_block || block_bitmap > last_block)

		{
@@ -1524,8 +1520,6 @@ static int ext4_check_descriptors (struct super_block * sb) 
		}

		if (!flexbg_flag)

			first_block += EXT4_BLOCKS_PER_GROUP(sb);

		gdp = (struct ext4_group_desc *)

			((__u8 *)gdp + EXT4_DESC_SIZE(sb));

	}



	ext4_free_blocks_count_set(sbi->s_es, ext4_count_free_blocks(sb));