tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+6
-6
+6
-6
fs/btrfs/transaction.c
+6
-6
fs/btrfs/transaction.c
···
543
543
btrfs_free_log(trans, root);
544
544
btrfs_update_reloc_root(trans, root);
545
545
546
-
if (root->commit_root == root->node)
547
-
continue;
546
+
if (root->commit_root != root->node) {
547
+
free_extent_buffer(root->commit_root);
548
+
root->commit_root = btrfs_root_node(root);
549
+
btrfs_set_root_node(&root->root_item,
550
+
root->node);
551
+
}
548
552
549
-
free_extent_buffer(root->commit_root);
550
-
root->commit_root = btrfs_root_node(root);
551
-
552
-
btrfs_set_root_node(&root->root_item, root->node);
553
553
err = btrfs_update_root(trans, fs_info->tree_root,
554
554
&root->root_key,
555
555
&root->root_item);