Unverified Commit 74d13ba5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12426 btrfs: fix a NULL pointer dereference when failed to start a new trasacntion 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yifan Qiao <qiaoyifan4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WSBEQR7ZMHQX3AGKOBULGQEA47BWLXQU/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRC7 
 
Link:https://gitee.com/openeuler/kernel/pulls/12426

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 22311063 ddb15fcd

fs/btrfs/relocation.c

+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ int btrfs_update_reloc_root(struct btrfs_trans_handle *trans, 
	btrfs_grab_root(reloc_root);



	/* root->reloc_root will stay until current relocation finished */

	if (fs_info->reloc_ctl->merge_reloc_tree &&

	if (fs_info->reloc_ctl && fs_info->reloc_ctl->merge_reloc_tree &&

	    btrfs_root_refs(root_item) == 0) {

		set_bit(BTRFS_ROOT_DEAD_RELOC_TREE, &root->state);

		/*