mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
ext3: use ext3_group_first_block_no()
Use ext3_group_first_block_no() Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: <linux-ext4@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
15633005e0
commit
1eaafeae4b
2 changed files with 4 additions and 7 deletions
|
@ -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));
|
||||
|
|
|
@ -799,10 +799,8 @@ inserted:
|
|||
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)
|
||||
|
|
Loading…
Reference in a new issue