[4/8] ext4: fix wrong unit use in ext4_mb_find_by_goal

Message ID 20230321161220.418652-5-shikemeng@huaweicloud.com
State New
Headers
Series Some fixes and cleanup to mballoc |

Commit Message

Kemeng Shi March 21, 2023, 4:12 p.m. UTC
  We need start in block unit while fe_start is in cluster unit. Use
ext4_grp_offs_to_block helper to convert fe_start to get start in
block unit.

Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
---
 fs/ext4/mballoc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
  

Comments

Ojaswin Mujoo April 7, 2023, 11:02 a.m. UTC | #1
On Wed, Mar 22, 2023 at 12:12:16AM +0800, Kemeng Shi wrote:
> We need start in block unit while fe_start is in cluster unit. Use
> ext4_grp_offs_to_block helper to convert fe_start to get start in
> block unit.
> 
> Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>

Feel free to add:

Reviewed-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>

Regards,
ojaswin

> ---
>  fs/ext4/mballoc.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
> index 86d978e1f7dc..9a40e165e7d2 100644
> --- a/fs/ext4/mballoc.c
> +++ b/fs/ext4/mballoc.c
> @@ -2181,8 +2181,7 @@ int ext4_mb_find_by_goal(struct ext4_allocation_context *ac,
>  	if (max >= ac->ac_g_ex.fe_len && ac->ac_g_ex.fe_len == sbi->s_stripe) {
>  		ext4_fsblk_t start;
>  
> -		start = ext4_group_first_block_no(ac->ac_sb, e4b->bd_group) +
> -			ex.fe_start;
> +		start = ext4_grp_offs_to_block(ac->ac_sb, &ex);
>  		/* use do_div to get remainder (would be 64-bit modulo) */
>  		if (do_div(start, sbi->s_stripe) == 0) {
>  			ac->ac_found++;
> -- 
> 2.30.0
>
  

Patch

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 86d978e1f7dc..9a40e165e7d2 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -2181,8 +2181,7 @@  int ext4_mb_find_by_goal(struct ext4_allocation_context *ac,
 	if (max >= ac->ac_g_ex.fe_len && ac->ac_g_ex.fe_len == sbi->s_stripe) {
 		ext4_fsblk_t start;
 
-		start = ext4_group_first_block_no(ac->ac_sb, e4b->bd_group) +
-			ex.fe_start;
+		start = ext4_grp_offs_to_block(ac->ac_sb, &ex);
 		/* use do_div to get remainder (would be 64-bit modulo) */
 		if (do_div(start, sbi->s_stripe) == 0) {
 			ac->ac_found++;