iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ext4: return found group directly in ext4_mb_choose_next_group_p2_aligned

Browse Source 
Return good group when it's found in loop to remove unnecessary NULL
initialization of grp and futher check if good group is found after loop.

Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
Link: https://lore.kernel.org/r/20230801143204.2284343-4-shikemeng@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Kemeng Shi 2023-08-01 22:31:57 +08:00 committed by Theodore Ts'o
parent 60c672b7f2
commit 919eb90cec
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/ext4/mballoc.c
View File

@ -874,7 +874,7 @@ static void ext4_mb_choose_next_group_p2_aligned(struct ext4_allocation_context
enum criteria *new_cr, ext4_group_t *group, ext4_group_t ngroups) enum criteria *new_cr, ext4_group_t *group, ext4_group_t ngroups)
{ {
struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
struct ext4_group_info *iter, *grp; struct ext4_group_info *iter;
int i; int i;
if (ac->ac_status == AC_STATUS_FOUND) if (ac->ac_status == AC_STATUS_FOUND)
@ -883,7 +883,6 @@ static void ext4_mb_choose_next_group_p2_aligned(struct ext4_allocation_context
if (unlikely(sbi->s_mb_stats && ac->ac_flags & EXT4_MB_CR_POWER2_ALIGNED_OPTIMIZED)) if (unlikely(sbi->s_mb_stats && ac->ac_flags & EXT4_MB_CR_POWER2_ALIGNED_OPTIMIZED))
atomic_inc(&sbi->s_bal_p2_aligned_bad_suggestions); atomic_inc(&sbi->s_bal_p2_aligned_bad_suggestions);
grp = NULL;
for (i = ac->ac_2order; i < MB_NUM_ORDERS(ac->ac_sb); i++) { for (i = ac->ac_2order; i < MB_NUM_ORDERS(ac->ac_sb); i++) {
if (list_empty(&sbi->s_mb_largest_free_orders[i])) if (list_empty(&sbi->s_mb_largest_free_orders[i]))
continue; continue;
@ -892,28 +891,22 @@ static void ext4_mb_choose_next_group_p2_aligned(struct ext4_allocation_context
read_unlock(&sbi->s_mb_largest_free_orders_locks[i]); read_unlock(&sbi->s_mb_largest_free_orders_locks[i]);
continue; continue;
} }
grp = NULL;
list_for_each_entry(iter, &sbi->s_mb_largest_free_orders[i], list_for_each_entry(iter, &sbi->s_mb_largest_free_orders[i],
bb_largest_free_order_node) { bb_largest_free_order_node) {
if (sbi->s_mb_stats) if (sbi->s_mb_stats)
atomic64_inc(&sbi->s_bal_cX_groups_considered[CR_POWER2_ALIGNED]); atomic64_inc(&sbi->s_bal_cX_groups_considered[CR_POWER2_ALIGNED]);
if (likely(ext4_mb_good_group(ac, iter->bb_group, CR_POWER2_ALIGNED))) { if (likely(ext4_mb_good_group(ac, iter->bb_group, CR_POWER2_ALIGNED))) {
grp = iter; *group = iter->bb_group;
break; ac->ac_flags |= EXT4_MB_CR_POWER2_ALIGNED_OPTIMIZED;
read_unlock(&sbi->s_mb_largest_free_orders_locks[i]);
return;
} }
} }
read_unlock(&sbi->s_mb_largest_free_orders_locks[i]); read_unlock(&sbi->s_mb_largest_free_orders_locks[i]);
if (grp)
break;
} }
if (!grp) { /* Increment cr and search again if no group is found */
/* Increment cr and search again */ *new_cr = CR_GOAL_LEN_FAST;
*new_cr = CR_GOAL_LEN_FAST;
} else {
*group = grp->bb_group;
ac->ac_flags |= EXT4_MB_CR_POWER2_ALIGNED_OPTIMIZED;
}
} }
/* /*