Btrfs: fix ASSERT(list_empty(&cur_trans->dirty_bgs_list)
Dave could hit this assert consistently running btrfs/078. This is because when we update the block groups we could truncate the free space, which would try to delete the csums for that range and dirty the csum root. For this to happen we have to have already written out the csum root so it's kind of hard to hit this case. This patch fixes this by changing the logic to only write the dirty block groups if the dirty_cowonly_roots list is empty. This will get us the same effect as before since we add the extent root last, and will cover the case that we dirty some other root again but not the extent root. Thanks, Reported-by: David Sterba <dsterba@suse.cz> Signed-off-by: Josef Bacik <jbacik@fb.com> Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Родитель
6a41dd0922
Коммит
ea526d1899
|
@ -1023,7 +1023,6 @@ static int update_cowonly_root(struct btrfs_trans_handle *trans,
|
||||||
u64 old_root_bytenr;
|
u64 old_root_bytenr;
|
||||||
u64 old_root_used;
|
u64 old_root_used;
|
||||||
struct btrfs_root *tree_root = root->fs_info->tree_root;
|
struct btrfs_root *tree_root = root->fs_info->tree_root;
|
||||||
bool extent_root = (root->objectid == BTRFS_EXTENT_TREE_OBJECTID);
|
|
||||||
|
|
||||||
old_root_used = btrfs_root_used(&root->root_item);
|
old_root_used = btrfs_root_used(&root->root_item);
|
||||||
btrfs_write_dirty_block_groups(trans, root);
|
btrfs_write_dirty_block_groups(trans, root);
|
||||||
|
@ -1031,9 +1030,7 @@ static int update_cowonly_root(struct btrfs_trans_handle *trans,
|
||||||
while (1) {
|
while (1) {
|
||||||
old_root_bytenr = btrfs_root_bytenr(&root->root_item);
|
old_root_bytenr = btrfs_root_bytenr(&root->root_item);
|
||||||
if (old_root_bytenr == root->node->start &&
|
if (old_root_bytenr == root->node->start &&
|
||||||
old_root_used == btrfs_root_used(&root->root_item) &&
|
old_root_used == btrfs_root_used(&root->root_item))
|
||||||
(!extent_root ||
|
|
||||||
list_empty(&trans->transaction->dirty_bgs)))
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
btrfs_set_root_node(&root->root_item, root->node);
|
btrfs_set_root_node(&root->root_item, root->node);
|
||||||
|
@ -1044,14 +1041,6 @@ static int update_cowonly_root(struct btrfs_trans_handle *trans,
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
old_root_used = btrfs_root_used(&root->root_item);
|
old_root_used = btrfs_root_used(&root->root_item);
|
||||||
if (extent_root) {
|
|
||||||
ret = btrfs_write_dirty_block_groups(trans, root);
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
ret = btrfs_run_delayed_refs(trans, root, (unsigned long)-1);
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -1068,6 +1057,7 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans,
|
||||||
struct btrfs_root *root)
|
struct btrfs_root *root)
|
||||||
{
|
{
|
||||||
struct btrfs_fs_info *fs_info = root->fs_info;
|
struct btrfs_fs_info *fs_info = root->fs_info;
|
||||||
|
struct list_head *dirty_bgs = &trans->transaction->dirty_bgs;
|
||||||
struct list_head *next;
|
struct list_head *next;
|
||||||
struct extent_buffer *eb;
|
struct extent_buffer *eb;
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -1099,7 +1089,7 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans,
|
||||||
ret = btrfs_run_delayed_refs(trans, root, (unsigned long)-1);
|
ret = btrfs_run_delayed_refs(trans, root, (unsigned long)-1);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
again:
|
||||||
while (!list_empty(&fs_info->dirty_cowonly_roots)) {
|
while (!list_empty(&fs_info->dirty_cowonly_roots)) {
|
||||||
next = fs_info->dirty_cowonly_roots.next;
|
next = fs_info->dirty_cowonly_roots.next;
|
||||||
list_del_init(next);
|
list_del_init(next);
|
||||||
|
@ -1112,8 +1102,23 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans,
|
||||||
ret = update_cowonly_root(trans, root);
|
ret = update_cowonly_root(trans, root);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
ret = btrfs_run_delayed_refs(trans, root, (unsigned long)-1);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
while (!list_empty(dirty_bgs)) {
|
||||||
|
ret = btrfs_write_dirty_block_groups(trans, root);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
ret = btrfs_run_delayed_refs(trans, root, (unsigned long)-1);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!list_empty(&fs_info->dirty_cowonly_roots))
|
||||||
|
goto again;
|
||||||
|
|
||||||
list_add_tail(&fs_info->extent_root->dirty_list,
|
list_add_tail(&fs_info->extent_root->dirty_list,
|
||||||
&trans->transaction->switch_commits);
|
&trans->transaction->switch_commits);
|
||||||
btrfs_after_dev_replace_commit(fs_info);
|
btrfs_after_dev_replace_commit(fs_info);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче