diff options
Diffstat (limited to 'fs/btrfs/qgroup.c')
-rw-r--r-- | fs/btrfs/qgroup.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 9d4c05b14f6e..13e28d8a7d42 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c | |||
@@ -1453,9 +1453,10 @@ int btrfs_qgroup_prepare_account_extents(struct btrfs_trans_handle *trans, | |||
1453 | return ret; | 1453 | return ret; |
1454 | } | 1454 | } |
1455 | 1455 | ||
1456 | struct btrfs_qgroup_extent_record | 1456 | struct btrfs_qgroup_extent_record * |
1457 | *btrfs_qgroup_insert_dirty_extent(struct btrfs_delayed_ref_root *delayed_refs, | 1457 | btrfs_qgroup_insert_dirty_extent(struct btrfs_fs_info *fs_info, |
1458 | struct btrfs_qgroup_extent_record *record) | 1458 | struct btrfs_delayed_ref_root *delayed_refs, |
1459 | struct btrfs_qgroup_extent_record *record) | ||
1459 | { | 1460 | { |
1460 | struct rb_node **p = &delayed_refs->dirty_extent_root.rb_node; | 1461 | struct rb_node **p = &delayed_refs->dirty_extent_root.rb_node; |
1461 | struct rb_node *parent_node = NULL; | 1462 | struct rb_node *parent_node = NULL; |
@@ -1463,7 +1464,7 @@ struct btrfs_qgroup_extent_record | |||
1463 | u64 bytenr = record->bytenr; | 1464 | u64 bytenr = record->bytenr; |
1464 | 1465 | ||
1465 | assert_spin_locked(&delayed_refs->lock); | 1466 | assert_spin_locked(&delayed_refs->lock); |
1466 | trace_btrfs_qgroup_insert_dirty_extent(record); | 1467 | trace_btrfs_qgroup_insert_dirty_extent(fs_info, record); |
1467 | 1468 | ||
1468 | while (*p) { | 1469 | while (*p) { |
1469 | parent_node = *p; | 1470 | parent_node = *p; |
@@ -1595,8 +1596,8 @@ static int qgroup_update_counters(struct btrfs_fs_info *fs_info, | |||
1595 | cur_old_count = btrfs_qgroup_get_old_refcnt(qg, seq); | 1596 | cur_old_count = btrfs_qgroup_get_old_refcnt(qg, seq); |
1596 | cur_new_count = btrfs_qgroup_get_new_refcnt(qg, seq); | 1597 | cur_new_count = btrfs_qgroup_get_new_refcnt(qg, seq); |
1597 | 1598 | ||
1598 | trace_qgroup_update_counters(qg->qgroupid, cur_old_count, | 1599 | trace_qgroup_update_counters(fs_info, qg->qgroupid, |
1599 | cur_new_count); | 1600 | cur_old_count, cur_new_count); |
1600 | 1601 | ||
1601 | /* Rfer update part */ | 1602 | /* Rfer update part */ |
1602 | if (cur_old_count == 0 && cur_new_count > 0) { | 1603 | if (cur_old_count == 0 && cur_new_count > 0) { |
@@ -1687,8 +1688,8 @@ btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans, | |||
1687 | goto out_free; | 1688 | goto out_free; |
1688 | BUG_ON(!fs_info->quota_root); | 1689 | BUG_ON(!fs_info->quota_root); |
1689 | 1690 | ||
1690 | trace_btrfs_qgroup_account_extent(bytenr, num_bytes, nr_old_roots, | 1691 | trace_btrfs_qgroup_account_extent(fs_info, bytenr, num_bytes, |
1691 | nr_new_roots); | 1692 | nr_old_roots, nr_new_roots); |
1692 | 1693 | ||
1693 | qgroups = ulist_alloc(GFP_NOFS); | 1694 | qgroups = ulist_alloc(GFP_NOFS); |
1694 | if (!qgroups) { | 1695 | if (!qgroups) { |
@@ -1759,7 +1760,7 @@ int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans, | |||
1759 | record = rb_entry(node, struct btrfs_qgroup_extent_record, | 1760 | record = rb_entry(node, struct btrfs_qgroup_extent_record, |
1760 | node); | 1761 | node); |
1761 | 1762 | ||
1762 | trace_btrfs_qgroup_account_extents(record); | 1763 | trace_btrfs_qgroup_account_extents(fs_info, record); |
1763 | 1764 | ||
1764 | if (!ret) { | 1765 | if (!ret) { |
1765 | /* | 1766 | /* |