Skip to content

Commit

Permalink
Btrfs: always update root items for fs trees at commit time
Browse files Browse the repository at this point in the history
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: Yan Zheng <zheng.yan@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
  • Loading branch information
Yan Zheng authored and Chris Mason committed Jun 16, 2009
1 parent b263c2c commit 978d910
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions fs/btrfs/transaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -543,13 +543,13 @@ static noinline int commit_fs_roots(struct btrfs_trans_handle *trans,
btrfs_free_log(trans, root);
btrfs_update_reloc_root(trans, root);

if (root->commit_root == root->node)
continue;

free_extent_buffer(root->commit_root);
root->commit_root = btrfs_root_node(root);
if (root->commit_root != root->node) {
free_extent_buffer(root->commit_root);
root->commit_root = btrfs_root_node(root);
btrfs_set_root_node(&root->root_item,
root->node);
}

btrfs_set_root_node(&root->root_item, root->node);
err = btrfs_update_root(trans, fs_info->tree_root,
&root->root_key,
&root->root_item);
Expand Down

0 comments on commit 978d910

Please sign in to comment.