Unverified Commit 4134526a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5847 ext4: avoid allocating blocks from corrupted group in ext4_mb_find_by_goal() 

Merge Pull Request from: @ci-robot 
 
PR sync from: ZhaoLong Wang <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/DUJNWBMQWAXKJ4YYH3NHMDFCRBII35V4/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9E2MF 
 
Link:https://gitee.com/openeuler/kernel/pulls/5847

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 14b3ddaf 506726bd

fs/ext4/mballoc.c

+4 −5
Original line number Diff line number Diff line
@@ -1916,12 +1916,10 @@ int ext4_mb_find_by_goal(struct ext4_allocation_context *ac, 
	if (err)

		return err;



	if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(e4b->bd_info))) {

		ext4_mb_unload_buddy(e4b);

		return 0;

	}



	ext4_lock_group(ac->ac_sb, group);

	if (unlikely(EXT4_MB_GRP_BBITMAP_CORRUPT(e4b->bd_info)))

		goto out;



	max = mb_find_extent(e4b, ac->ac_g_ex.fe_start,

			     ac->ac_g_ex.fe_len, &ex);

	ex.fe_logical = 0xDEADFA11; /* debug value */
@@ -1954,6 +1952,7 @@ int ext4_mb_find_by_goal(struct ext4_allocation_context *ac, 
		ac->ac_b_ex = ex;

		ext4_mb_use_best_found(ac, e4b);

	}

out:

	ext4_unlock_group(ac->ac_sb, group);

	ext4_mb_unload_buddy(e4b);