diff options
| author |   Josef Bacik <josef@toxicpanda.com> | 2021-11-05 16:45:39 -0400 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2022-01-03 15:09:48 +0100 |
| commit | 826582cabc22e741ef3d420fd53b83de988b5647 (patch) | |
| tree | 2bef051d5adea2ba36d3c918f3bd33a8adf23faf /fs/btrfs/transaction.c | |
| parent | btrfs: use chunk_root in find_free_extent_update_loop (diff) | |
| download | linux-dev-826582cabc22e741ef3d420fd53b83de988b5647.tar.xz linux-dev-826582cabc22e741ef3d420fd53b83de988b5647.zip | |
btrfs: do not special case the extent root for switch commit roots
This is a leftover from when we used to independently swap the extent
root's commit root and the fs tree commit roots. At the time I simply
changed the helper to a list_add. There's actually no reason to not add
the extent root to the switch commit root at this point, we don't care
about the order we do the switching since it's all done under the
commit_root_sem.
If we re-mark the extent root dirty after adding it to the
switch_commits list we'll see that BTRFS_ROOT_DIRTY isn't set and then
list_move it back onto the dirty list, and then we'll redo the tree
update and everything will be ok.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 5b8f71aeccc9..c9f85c412b23 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1278,9 +1278,8 @@ again: root = list_entry(next, struct btrfs_root, dirty_list); clear_bit(BTRFS_ROOT_DIRTY, &root->state); - if (root != fs_info->extent_root) - list_add_tail(&root->dirty_list, - &trans->transaction->switch_commits); + list_add_tail(&root->dirty_list, + &trans->transaction->switch_commits); ret = update_cowonly_root(trans, root); if (ret) return ret; @@ -1310,9 +1309,6 @@ again: if (!list_empty(&fs_info->dirty_cowonly_roots)) goto again; - list_add_tail(&fs_info->extent_root->dirty_list, - &trans->transaction->switch_commits); - /* Update dev-replace pointer once everything is committed */ fs_info->dev_replace.committed_cursor_left = fs_info->dev_replace.cursor_left_last_write_of_item; |