Commit 978d910d authored by Yan Zheng's avatar Yan Zheng Committed by Chris Mason
Browse files

Btrfs: always update root items for fs trees at commit time

commit_fs_roots skips updating root items for fs trees that aren't modified.
This is unsafe now that relocation code modifies root item's last_snapshot
field without modifying corresponding fs tree.
Signed-off-by: default avatarYan Zheng <>
Signed-off-by: default avatarChris Mason <>
parent b263c2c8
...@@ -543,13 +543,13 @@ static noinline int commit_fs_roots(struct btrfs_trans_handle *trans, ...@@ -543,13 +543,13 @@ static noinline int commit_fs_roots(struct btrfs_trans_handle *trans,
btrfs_free_log(trans, root); btrfs_free_log(trans, root);
btrfs_update_reloc_root(trans, root); btrfs_update_reloc_root(trans, root);
if (root->commit_root == root->node) if (root->commit_root != root->node) {
free_extent_buffer(root->commit_root); free_extent_buffer(root->commit_root);
root->commit_root = btrfs_root_node(root); root->commit_root = btrfs_root_node(root);
btrfs_set_root_node(&root->root_item, root->node);
err = btrfs_update_root(trans, fs_info->tree_root, err = btrfs_update_root(trans, fs_info->tree_root,
&root->root_key, &root->root_key,
&root->root_item); &root->root_item);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment