Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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 <zheng.yan@oracle.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent b263c2c8

fs/btrfs/transaction.c

+6 −6
Original line number Diff line number Diff line
@@ -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;



			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);