diff options
-rw-r--r-- | fs/ext4/ialloc.c | 3 | ||||
-rw-r--r-- | fs/ext4/super.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index 82f7d1d7eae0..3743bd849bce 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c | |||
@@ -347,7 +347,6 @@ static int find_group_flex(struct super_block *sb, struct inode *parent, | |||
347 | { | 347 | { |
348 | struct ext4_sb_info *sbi = EXT4_SB(sb); | 348 | struct ext4_sb_info *sbi = EXT4_SB(sb); |
349 | struct ext4_group_desc *desc; | 349 | struct ext4_group_desc *desc; |
350 | struct buffer_head *bh; | ||
351 | struct flex_groups *flex_group = sbi->s_flex_groups; | 350 | struct flex_groups *flex_group = sbi->s_flex_groups; |
352 | ext4_group_t parent_group = EXT4_I(parent)->i_block_group; | 351 | ext4_group_t parent_group = EXT4_I(parent)->i_block_group; |
353 | ext4_group_t parent_fbg_group = ext4_flex_group(sbi, parent_group); | 352 | ext4_group_t parent_fbg_group = ext4_flex_group(sbi, parent_group); |
@@ -402,7 +401,7 @@ find_close_to_parent: | |||
402 | found_flexbg: | 401 | found_flexbg: |
403 | for (i = best_flex * flex_size; i < ngroups && | 402 | for (i = best_flex * flex_size; i < ngroups && |
404 | i < (best_flex + 1) * flex_size; i++) { | 403 | i < (best_flex + 1) * flex_size; i++) { |
405 | desc = ext4_get_group_desc(sb, i, &bh); | 404 | desc = ext4_get_group_desc(sb, i, NULL); |
406 | if (ext4_free_inodes_count(sb, desc)) { | 405 | if (ext4_free_inodes_count(sb, desc)) { |
407 | *best_group = i; | 406 | *best_group = i; |
408 | goto out; | 407 | goto out; |
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index eca6c057b119..91b98b58ccb9 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -1660,7 +1660,6 @@ static int ext4_fill_flex_info(struct super_block *sb) | |||
1660 | { | 1660 | { |
1661 | struct ext4_sb_info *sbi = EXT4_SB(sb); | 1661 | struct ext4_sb_info *sbi = EXT4_SB(sb); |
1662 | struct ext4_group_desc *gdp = NULL; | 1662 | struct ext4_group_desc *gdp = NULL; |
1663 | struct buffer_head *bh; | ||
1664 | ext4_group_t flex_group_count; | 1663 | ext4_group_t flex_group_count; |
1665 | ext4_group_t flex_group; | 1664 | ext4_group_t flex_group; |
1666 | int groups_per_flex = 0; | 1665 | int groups_per_flex = 0; |
@@ -1693,7 +1692,7 @@ static int ext4_fill_flex_info(struct super_block *sb) | |||
1693 | } | 1692 | } |
1694 | 1693 | ||
1695 | for (i = 0; i < sbi->s_groups_count; i++) { | 1694 | for (i = 0; i < sbi->s_groups_count; i++) { |
1696 | gdp = ext4_get_group_desc(sb, i, &bh); | 1695 | gdp = ext4_get_group_desc(sb, i, NULL); |
1697 | 1696 | ||
1698 | flex_group = ext4_flex_group(sbi, i); | 1697 | flex_group = ext4_flex_group(sbi, i); |
1699 | atomic_set(&sbi->s_flex_groups[flex_group].free_inodes, | 1698 | atomic_set(&sbi->s_flex_groups[flex_group].free_inodes, |