aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/transaction.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/transaction.c')
-rw-r--r--fs/btrfs/transaction.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 29bef63e23ba..373c7ec1a026 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -991,7 +991,7 @@ static void update_super_roots(struct btrfs_root *root)
991 struct btrfs_root_item *root_item; 991 struct btrfs_root_item *root_item;
992 struct btrfs_super_block *super; 992 struct btrfs_super_block *super;
993 993
994 super = &root->fs_info->super_copy; 994 super = root->fs_info->super_copy;
995 995
996 root_item = &root->fs_info->chunk_root->root_item; 996 root_item = &root->fs_info->chunk_root->root_item;
997 super->chunk_root = root_item->bytenr; 997 super->chunk_root = root_item->bytenr;
@@ -1301,12 +1301,12 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
1301 update_super_roots(root); 1301 update_super_roots(root);
1302 1302
1303 if (!root->fs_info->log_root_recovering) { 1303 if (!root->fs_info->log_root_recovering) {
1304 btrfs_set_super_log_root(&root->fs_info->super_copy, 0); 1304 btrfs_set_super_log_root(root->fs_info->super_copy, 0);
1305 btrfs_set_super_log_root_level(&root->fs_info->super_copy, 0); 1305 btrfs_set_super_log_root_level(root->fs_info->super_copy, 0);
1306 } 1306 }
1307 1307
1308 memcpy(&root->fs_info->super_for_commit, &root->fs_info->super_copy, 1308 memcpy(root->fs_info->super_for_commit, root->fs_info->super_copy,
1309 sizeof(root->fs_info->super_copy)); 1309 sizeof(*root->fs_info->super_copy));
1310 1310
1311 trans->transaction->blocked = 0; 1311 trans->transaction->blocked = 0;
1312 spin_lock(&root->fs_info->trans_lock); 1312 spin_lock(&root->fs_info->trans_lock);