Commit dddcd2f9 authored by brookxu's avatar brookxu Committed by Theodore Ts'o

ext4: optimize the implementation of ext4_mb_good_group()

It might be better to adjust the code in two places:
1. Determine whether grp is currupt or not should be placed first.
2. (cr<=2 && free <ac->ac_g_ex.fe_len)should may belong to the crx
   strategy, and it may be more appropriate to put it in the
   subsequent switch statement block. For cr1, cr2, the conditions
   in switch potentially realize the above judgment. For cr0, we
   should add (free <ac->ac_g_ex.fe_len) judgment, and then delete
   (free / fragments) >= ac->ac_g_ex.fe_len), because cr0 returns
   true by default.
Signed-off-by: default avatarChunguang Xu <brookxu@tencent.com>
Reviewed-by: default avatarAndreas Dilger <adilger@dilger.ca>
Reviewed-by: default avatarRitesh Harjani <riteshh@linux.ibm.com>
Link: https://lore.kernel.org/r/e20b2d8f-1154-adb7-3831-a9e11ba842e9@gmail.comSigned-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 051e2ce8
...@@ -2112,13 +2112,11 @@ static bool ext4_mb_good_group(struct ext4_allocation_context *ac, ...@@ -2112,13 +2112,11 @@ static bool ext4_mb_good_group(struct ext4_allocation_context *ac,
BUG_ON(cr < 0 || cr >= 4); BUG_ON(cr < 0 || cr >= 4);
free = grp->bb_free; if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(grp)))
if (free == 0)
return false;
if (cr <= 2 && free < ac->ac_g_ex.fe_len)
return false; return false;
if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(grp))) free = grp->bb_free;
if (free == 0)
return false; return false;
fragments = grp->bb_fragments; fragments = grp->bb_fragments;
...@@ -2135,8 +2133,10 @@ static bool ext4_mb_good_group(struct ext4_allocation_context *ac, ...@@ -2135,8 +2133,10 @@ static bool ext4_mb_good_group(struct ext4_allocation_context *ac,
((group % flex_size) == 0)) ((group % flex_size) == 0))
return false; return false;
if ((ac->ac_2order > ac->ac_sb->s_blocksize_bits+1) || if (free < ac->ac_g_ex.fe_len)
(free / fragments) >= ac->ac_g_ex.fe_len) return false;
if (ac->ac_2order > ac->ac_sb->s_blocksize_bits+1)
return true; return true;
if (grp->bb_largest_free_order < ac->ac_2order) if (grp->bb_largest_free_order < ac->ac_2order)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment