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

Commit 69257cae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable 

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: always update root items for fs trees at commit time
parents 23059a0d 978d910d

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