On 2/27/17 2:10 AM, Qu Wenruo wrote: > Newly introduced qgroup reserved space trace points are normally nested > into several common qgroup operations. > > While some other trace points are not well placed to co-operate with > them, causing confusing output. > > This patch re-arrange trace_btrfs_qgroup_release_data() and > trace_btrfs_qgroup_free_delayed_ref() trace points so they are triggered > before reserved space ones. > > Signed-off-by: Qu Wenruo <quwen...@cn.fujitsu.com>
Reviewed-by: Jeff Mahoney <je...@suse.com>
> ---
> fs/btrfs/qgroup.c | 10 +++++-----
> fs/btrfs/qgroup.h | 6 +-----
> 2 files changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
> index b303d4794026..e46499cafdbf 100644
> --- a/fs/btrfs/qgroup.c
> +++ b/fs/btrfs/qgroup.c
> @@ -2895,14 +2895,14 @@ static int __btrfs_qgroup_release_data(struct inode
> *inode, u64 start, u64 len,
> if (ret < 0)
> goto out;
>
> - if (free) {
> - btrfs_qgroup_free_refroot(BTRFS_I(inode)->root->fs_info,
> - BTRFS_I(inode)->root->objectid,
> - changeset.bytes_changed);
> + if (free)
> trace_op = QGROUP_FREE;
> - }
> trace_btrfs_qgroup_release_data(inode, start, len,
> changeset.bytes_changed, trace_op);
> + if (free)
> + btrfs_qgroup_free_refroot(BTRFS_I(inode)->root->fs_info,
> + BTRFS_I(inode)->root->objectid,
> + changeset.bytes_changed);
> out:
> ulist_release(&changeset.range_changed);
> return ret;
> diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h
> index 26932a8a1993..92608edf0e89 100644
> --- a/fs/btrfs/qgroup.h
> +++ b/fs/btrfs/qgroup.h
> @@ -186,15 +186,11 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle
> *trans,
> struct btrfs_qgroup_inherit *inherit);
> void btrfs_qgroup_free_refroot(struct btrfs_fs_info *fs_info,
> u64 ref_root, u64 num_bytes);
> -/*
> - * TODO: Add proper trace point for it, as btrfs_qgroup_free() is
> - * called by everywhere, can't provide good trace for delayed ref case.
> - */
> static inline void btrfs_qgroup_free_delayed_ref(struct btrfs_fs_info
> *fs_info,
> u64 ref_root, u64 num_bytes)
> {
> - btrfs_qgroup_free_refroot(fs_info, ref_root, num_bytes);
> trace_btrfs_qgroup_free_delayed_ref(fs_info, ref_root, num_bytes);
> + btrfs_qgroup_free_refroot(fs_info, ref_root, num_bytes);
> }
> void assert_qgroups_uptodate(struct btrfs_trans_handle *trans);
>
>
--
Jeff Mahoney
SUSE Labs
signature.asc
Description: OpenPGP digital signature
