diff options
| author | Joel Stanley <joel@jms.id.au> | 2020-08-10 07:07:46 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2020-08-10 07:07:49 +0300 |
| commit | 4789fd48a313d36fe6b8fc1da5e0788f5ea074cb (patch) | |
| tree | 2c8c27b52f0e38abb7416ce81b04c3b85511b694 /fs/btrfs/relocation.c | |
| parent | 8a9b346382056b52cd7ff141ae9f15a0fcfeb13d (diff) | |
| parent | d9939285fc818425ae92bd99f8c97b6b9ef3bb88 (diff) | |
| download | linux-dev-5.4.tar.xz | |
Merge tag 'v5.4.57' into dev-5.4dev-5.4
This is the 5.4.57 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'fs/btrfs/relocation.c')
| -rw-r--r-- | fs/btrfs/relocation.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index e890f09e2073..1b087ee338cc 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -2525,12 +2525,10 @@ again: reloc_root = list_entry(reloc_roots.next, struct btrfs_root, root_list); + root = read_fs_root(fs_info, reloc_root->root_key.offset); if (btrfs_root_refs(&reloc_root->root_item) > 0) { - root = read_fs_root(fs_info, - reloc_root->root_key.offset); BUG_ON(IS_ERR(root)); BUG_ON(root->reloc_root != reloc_root); - ret = merge_reloc_root(rc, root); if (ret) { if (list_empty(&reloc_root->root_list)) @@ -2539,6 +2537,13 @@ again: goto out; } } else { + if (!IS_ERR(root)) { + if (root->reloc_root == reloc_root) + root->reloc_root = NULL; + clear_bit(BTRFS_ROOT_DEAD_RELOC_TREE, + &root->state); + } + list_del_init(&reloc_root->root_list); /* Don't forget to queue this reloc root for cleanup */ list_add_tail(&reloc_root->reloc_dirty_list, |