[PATCH] btrfs: qgroup: Remove duplicated trace points for qgroup_rsv_add/release()

[PATCH] btrfs: qgroup: Remove duplicated trace points for qgroup_rsv_add/release()

[Qu Wenruo]

Inside qgroup_rsv_add/release(), we have trace events
trace_qgroup_update_reserve() to catch reserved space update.

However we still have two manual trace_qgroup_update_reserve() calls
just outside these functions.

Remove these duplicated calls.

Fixes: 64ee4e751a1c ("btrfs: qgroup: Update trace events to use new separate rsv types")
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
 fs/btrfs/qgroup.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 45868fd76209..c1fbd8a30fc4 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -2952,7 +2952,6 @@ static int qgroup_reserve(struct btrfs_root *root, u64 num_bytes, bool enforce,
 
 		qg = unode_aux_to_qgroup(unode);
 
-		trace_qgroup_update_reserve(fs_info, qg, num_bytes, type);
 		qgroup_rsv_add(fs_info, qg, num_bytes, type);
 	}
 
@@ -3019,7 +3018,6 @@ void btrfs_qgroup_free_refroot(struct btrfs_fs_info *fs_info,
 
 		qg = unode_aux_to_qgroup(unode);
 
-		trace_qgroup_update_reserve(fs_info, qg, -(s64)num_bytes, type);
 		qgroup_rsv_release(fs_info, qg, num_bytes, type);
 
 		list_for_each_entry(glist, &qg->groups, next_group) {
-- 
2.19.1

Re: [PATCH] btrfs: qgroup: Remove duplicated trace points for qgroup_rsv_add/release()

[Nikolay Borisov]

On 13.11.18 г. 9:05 ч., Qu Wenruo wrote:
> Inside qgroup_rsv_add/release(), we have trace events
> trace_qgroup_update_reserve() to catch reserved space update.
> 
> However we still have two manual trace_qgroup_update_reserve() calls
> just outside these functions.
> 
> Remove these duplicated calls.
> 
> Fixes: 64ee4e751a1c ("btrfs: qgroup: Update trace events to use new separate rsv types")
> Signed-off-by: Qu Wenruo <wqu@suse.com>

Reviewed-by: Nikolay Borisov <nborisov@suse.com>

> ---
>  fs/btrfs/qgroup.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
> index 45868fd76209..c1fbd8a30fc4 100644
> --- a/fs/btrfs/qgroup.c
> +++ b/fs/btrfs/qgroup.c
> @@ -2952,7 +2952,6 @@ static int qgroup_reserve(struct btrfs_root *root, u64 num_bytes, bool enforce,
>  
>  		qg = unode_aux_to_qgroup(unode);
>  
> -		trace_qgroup_update_reserve(fs_info, qg, num_bytes, type);
>  		qgroup_rsv_add(fs_info, qg, num_bytes, type);
>  	}
>  
> @@ -3019,7 +3018,6 @@ void btrfs_qgroup_free_refroot(struct btrfs_fs_info *fs_info,
>  
>  		qg = unode_aux_to_qgroup(unode);
>  
> -		trace_qgroup_update_reserve(fs_info, qg, -(s64)num_bytes, type);
>  		qgroup_rsv_release(fs_info, qg, num_bytes, type);
>  
>  		list_for_each_entry(glist, &qg->groups, next_group) {
> 

Re: [PATCH] btrfs: qgroup: Remove duplicated trace points for qgroup_rsv_add/release()

[David Sterba]

On Tue, Nov 13, 2018 at 03:05:08PM +0800, Qu Wenruo wrote:
> Inside qgroup_rsv_add/release(), we have trace events
> trace_qgroup_update_reserve() to catch reserved space update.
> 
> However we still have two manual trace_qgroup_update_reserve() calls
> just outside these functions.
> 
> Remove these duplicated calls.
> 
> Fixes: 64ee4e751a1c ("btrfs: qgroup: Update trace events to use new separate rsv types")
> Signed-off-by: Qu Wenruo <wqu@suse.com>

Added to misc-next, thanks.