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

Commit 1eaafeae authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

ext3: use ext3_group_first_block_no() 



Use ext3_group_first_block_no()

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 15633005

fs/ext3/super.c

+2 −3
Original line number Diff line number Diff line
@@ -1254,14 +1254,14 @@ static int ext3_setup_super(struct super_block *sb, struct ext3_super_block *es, 
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;

	int i;



	ext3_debug ("Checking group descriptors");



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

		struct ext3_group_desc *gdp = ext3_get_group_desc(sb, i, NULL);

		ext3_fsblk_t first_block = ext3_group_first_block_no(sb, i);

		ext3_fsblk_t last_block;



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

			last_block = le32_to_cpu(sbi->s_es->s_blocks_count) - 1;
@@ -1300,7 +1300,6 @@ static int ext3_check_descriptors(struct super_block *sb) 
					le32_to_cpu(gdp->bg_inode_table));

			return 0;

		}

		first_block += EXT3_BLOCKS_PER_GROUP(sb);

	}



	sbi->s_es->s_free_blocks_count=cpu_to_le32(ext3_count_free_blocks(sb));

fs/ext3/xattr.c

+2 −4
Original line number Diff line number Diff line
@@ -799,10 +799,8 @@ ext3_xattr_block_set(handle_t *handle, struct inode *inode, 
			get_bh(new_bh);

		} else {

			/* We need to allocate a new block */

			ext3_fsblk_t goal = le32_to_cpu(

					EXT3_SB(sb)->s_es->s_first_data_block) +

				(ext3_fsblk_t)EXT3_I(inode)->i_block_group *

				EXT3_BLOCKS_PER_GROUP(sb);

			ext3_fsblk_t goal = ext3_group_first_block_no(sb,

						EXT3_I(inode)->i_block_group);

			ext3_fsblk_t block = ext3_new_block(handle, inode,

							goal, &error);

			if (error)