Merge d73d48acf3
("btrfs: fix a NULL pointer dereference when failed to start a new trasacntion") into android12-5.10-lts
Steps on the way to 5.10.227 Change-Id: Id9261beea462bed16ae80004e8eb46eb8cb4cbeb Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
commit
d476e18cbf
@ -910,7 +910,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);
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user