diff options
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r-- | fs/btrfs/extent-tree.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 81d83300c99b..73f6dd2cf3cb 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -2204,7 +2204,7 @@ static int run_delayed_data_ref(struct btrfs_trans_handle *trans, | |||
2204 | ins.type = BTRFS_EXTENT_ITEM_KEY; | 2204 | ins.type = BTRFS_EXTENT_ITEM_KEY; |
2205 | 2205 | ||
2206 | ref = btrfs_delayed_node_to_data_ref(node); | 2206 | ref = btrfs_delayed_node_to_data_ref(node); |
2207 | trace_run_delayed_data_ref(node, ref, node->action); | 2207 | trace_run_delayed_data_ref(root->fs_info, node, ref, node->action); |
2208 | 2208 | ||
2209 | if (node->type == BTRFS_SHARED_DATA_REF_KEY) | 2209 | if (node->type == BTRFS_SHARED_DATA_REF_KEY) |
2210 | parent = ref->parent; | 2210 | parent = ref->parent; |
@@ -2359,7 +2359,7 @@ static int run_delayed_tree_ref(struct btrfs_trans_handle *trans, | |||
2359 | SKINNY_METADATA); | 2359 | SKINNY_METADATA); |
2360 | 2360 | ||
2361 | ref = btrfs_delayed_node_to_tree_ref(node); | 2361 | ref = btrfs_delayed_node_to_tree_ref(node); |
2362 | trace_run_delayed_tree_ref(node, ref, node->action); | 2362 | trace_run_delayed_tree_ref(root->fs_info, node, ref, node->action); |
2363 | 2363 | ||
2364 | if (node->type == BTRFS_SHARED_BLOCK_REF_KEY) | 2364 | if (node->type == BTRFS_SHARED_BLOCK_REF_KEY) |
2365 | parent = ref->parent; | 2365 | parent = ref->parent; |
@@ -2423,7 +2423,8 @@ static int run_one_delayed_ref(struct btrfs_trans_handle *trans, | |||
2423 | */ | 2423 | */ |
2424 | BUG_ON(extent_op); | 2424 | BUG_ON(extent_op); |
2425 | head = btrfs_delayed_node_to_head(node); | 2425 | head = btrfs_delayed_node_to_head(node); |
2426 | trace_run_delayed_ref_head(node, head, node->action); | 2426 | trace_run_delayed_ref_head(root->fs_info, node, head, |
2427 | node->action); | ||
2427 | 2428 | ||
2428 | if (insert_reserved) { | 2429 | if (insert_reserved) { |
2429 | btrfs_pin_extent(root, node->bytenr, | 2430 | btrfs_pin_extent(root, node->bytenr, |
@@ -8542,7 +8543,8 @@ static int record_one_subtree_extent(struct btrfs_trans_handle *trans, | |||
8542 | 8543 | ||
8543 | delayed_refs = &trans->transaction->delayed_refs; | 8544 | delayed_refs = &trans->transaction->delayed_refs; |
8544 | spin_lock(&delayed_refs->lock); | 8545 | spin_lock(&delayed_refs->lock); |
8545 | if (btrfs_qgroup_insert_dirty_extent(delayed_refs, qrecord)) | 8546 | if (btrfs_qgroup_insert_dirty_extent(trans->root->fs_info, |
8547 | delayed_refs, qrecord)) | ||
8546 | kfree(qrecord); | 8548 | kfree(qrecord); |
8547 | spin_unlock(&delayed_refs->lock); | 8549 | spin_unlock(&delayed_refs->lock); |
8548 | 8550 | ||