ext4: return found group directly in ext4_mb_choose_next_group_best_avail
authorKemeng Shi <shikemeng@huaweicloud.com>
Tue, 1 Aug 2023 14:32:03 +0000 (22:32 +0800)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 3 Aug 2023 14:47:30 +0000 (10:47 -0400)
Return good group when it's found in loop to remove 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-10-shikemeng@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/ext4/mballoc.c

index 3b1f90d..f9189f7 100644 (file)
@@ -1042,18 +1042,16 @@ static void ext4_mb_choose_next_group_best_avail(struct ext4_allocation_context
                                                        ac->ac_g_ex.fe_len);
 
                grp = ext4_mb_find_good_group_avg_frag_lists(ac, frag_order);
-               if (grp)
-                       break;
+               if (grp) {
+                       *group = grp->bb_group;
+                       ac->ac_flags |= EXT4_MB_CR_BEST_AVAIL_LEN_OPTIMIZED;
+                       return;
+               }
        }
 
-       if (grp) {
-               *group = grp->bb_group;
-               ac->ac_flags |= EXT4_MB_CR_BEST_AVAIL_LEN_OPTIMIZED;
-       } else {
-               /* Reset goal length to original goal length before falling into CR_GOAL_LEN_SLOW */
-               ac->ac_g_ex.fe_len = ac->ac_orig_goal_len;
-               *new_cr = CR_GOAL_LEN_SLOW;
-       }
+       /* Reset goal length to original goal length before falling into CR_GOAL_LEN_SLOW */
+       ac->ac_g_ex.fe_len = ac->ac_orig_goal_len;
+       *new_cr = CR_GOAL_LEN_SLOW;
 }
 
 static inline int should_optimize_scan(struct ext4_allocation_context *ac)