btrfs: constify tracepoint arguments

Tracepoint arguments are all read-only.  If we mark the arguments
as const, we're able to keep or convert those arguments to const
where appropriate.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Jeff Mahoney 2017-06-28 21:56:54 -06:00 committed by David Sterba
parent 1cbb1f454e
commit 9a35b63728
4 changed files with 136 additions and 122 deletions

View File

@ -75,18 +75,18 @@ void btrfs_##name(struct work_struct *arg) \
} }
struct btrfs_fs_info * struct btrfs_fs_info *
btrfs_workqueue_owner(struct __btrfs_workqueue *wq) btrfs_workqueue_owner(const struct __btrfs_workqueue *wq)
{ {
return wq->fs_info; return wq->fs_info;
} }
struct btrfs_fs_info * struct btrfs_fs_info *
btrfs_work_owner(struct btrfs_work *work) btrfs_work_owner(const struct btrfs_work *work)
{ {
return work->wq->fs_info; return work->wq->fs_info;
} }
bool btrfs_workqueue_normal_congested(struct btrfs_workqueue *wq) bool btrfs_workqueue_normal_congested(const struct btrfs_workqueue *wq)
{ {
/* /*
* We could compare wq->normal->pending with num_online_cpus() * We could compare wq->normal->pending with num_online_cpus()

View File

@ -82,7 +82,7 @@ void btrfs_queue_work(struct btrfs_workqueue *wq,
void btrfs_destroy_workqueue(struct btrfs_workqueue *wq); void btrfs_destroy_workqueue(struct btrfs_workqueue *wq);
void btrfs_workqueue_set_max(struct btrfs_workqueue *wq, int max); void btrfs_workqueue_set_max(struct btrfs_workqueue *wq, int max);
void btrfs_set_work_high_priority(struct btrfs_work *work); void btrfs_set_work_high_priority(struct btrfs_work *work);
struct btrfs_fs_info *btrfs_work_owner(struct btrfs_work *work); struct btrfs_fs_info *btrfs_work_owner(const struct btrfs_work *work);
struct btrfs_fs_info *btrfs_workqueue_owner(struct __btrfs_workqueue *wq); struct btrfs_fs_info *btrfs_workqueue_owner(const struct __btrfs_workqueue *wq);
bool btrfs_workqueue_normal_congested(struct btrfs_workqueue *wq); bool btrfs_workqueue_normal_congested(const struct btrfs_workqueue *wq);
#endif #endif

View File

@ -207,7 +207,7 @@ struct btrfs_inode {
extern unsigned char btrfs_filetype_table[]; extern unsigned char btrfs_filetype_table[];
static inline struct btrfs_inode *BTRFS_I(struct inode *inode) static inline struct btrfs_inode *BTRFS_I(const struct inode *inode)
{ {
return container_of(inode, struct btrfs_inode, vfs_inode); return container_of(inode, struct btrfs_inode, vfs_inode);
} }
@ -231,7 +231,7 @@ static inline void btrfs_insert_inode_hash(struct inode *inode)
__insert_inode_hash(inode, h); __insert_inode_hash(inode, h);
} }
static inline u64 btrfs_ino(struct btrfs_inode *inode) static inline u64 btrfs_ino(const struct btrfs_inode *inode)
{ {
u64 ino = inode->location.objectid; u64 ino = inode->location.objectid;

View File

@ -92,7 +92,7 @@ struct btrfs_qgroup;
TRACE_EVENT(btrfs_transaction_commit, TRACE_EVENT(btrfs_transaction_commit,
TP_PROTO(struct btrfs_root *root), TP_PROTO(const struct btrfs_root *root),
TP_ARGS(root), TP_ARGS(root),
@ -113,7 +113,7 @@ TRACE_EVENT(btrfs_transaction_commit,
DECLARE_EVENT_CLASS(btrfs__inode, DECLARE_EVENT_CLASS(btrfs__inode,
TP_PROTO(struct inode *inode), TP_PROTO(const struct inode *inode),
TP_ARGS(inode), TP_ARGS(inode),
@ -151,21 +151,21 @@ DECLARE_EVENT_CLASS(btrfs__inode,
DEFINE_EVENT(btrfs__inode, btrfs_inode_new, DEFINE_EVENT(btrfs__inode, btrfs_inode_new,
TP_PROTO(struct inode *inode), TP_PROTO(const struct inode *inode),
TP_ARGS(inode) TP_ARGS(inode)
); );
DEFINE_EVENT(btrfs__inode, btrfs_inode_request, DEFINE_EVENT(btrfs__inode, btrfs_inode_request,
TP_PROTO(struct inode *inode), TP_PROTO(const struct inode *inode),
TP_ARGS(inode) TP_ARGS(inode)
); );
DEFINE_EVENT(btrfs__inode, btrfs_inode_evict, DEFINE_EVENT(btrfs__inode, btrfs_inode_evict,
TP_PROTO(struct inode *inode), TP_PROTO(const struct inode *inode),
TP_ARGS(inode) TP_ARGS(inode)
); );
@ -192,8 +192,8 @@ DEFINE_EVENT(btrfs__inode, btrfs_inode_evict,
TRACE_EVENT_CONDITION(btrfs_get_extent, TRACE_EVENT_CONDITION(btrfs_get_extent,
TP_PROTO(struct btrfs_root *root, struct btrfs_inode *inode, TP_PROTO(const struct btrfs_root *root, const struct btrfs_inode *inode,
struct extent_map *map), const struct extent_map *map),
TP_ARGS(root, inode, map), TP_ARGS(root, inode, map),
@ -388,7 +388,8 @@ DEFINE_EVENT(
DECLARE_EVENT_CLASS(btrfs__ordered_extent, DECLARE_EVENT_CLASS(btrfs__ordered_extent,
TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), TP_PROTO(const struct inode *inode,
const struct btrfs_ordered_extent *ordered),
TP_ARGS(inode, ordered), TP_ARGS(inode, ordered),
@ -440,36 +441,40 @@ DECLARE_EVENT_CLASS(btrfs__ordered_extent,
DEFINE_EVENT(btrfs__ordered_extent, btrfs_ordered_extent_add, DEFINE_EVENT(btrfs__ordered_extent, btrfs_ordered_extent_add,
TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), TP_PROTO(const struct inode *inode,
const struct btrfs_ordered_extent *ordered),
TP_ARGS(inode, ordered) TP_ARGS(inode, ordered)
); );
DEFINE_EVENT(btrfs__ordered_extent, btrfs_ordered_extent_remove, DEFINE_EVENT(btrfs__ordered_extent, btrfs_ordered_extent_remove,
TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), TP_PROTO(const struct inode *inode,
const struct btrfs_ordered_extent *ordered),
TP_ARGS(inode, ordered) TP_ARGS(inode, ordered)
); );
DEFINE_EVENT(btrfs__ordered_extent, btrfs_ordered_extent_start, DEFINE_EVENT(btrfs__ordered_extent, btrfs_ordered_extent_start,
TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), TP_PROTO(const struct inode *inode,
const struct btrfs_ordered_extent *ordered),
TP_ARGS(inode, ordered) TP_ARGS(inode, ordered)
); );
DEFINE_EVENT(btrfs__ordered_extent, btrfs_ordered_extent_put, DEFINE_EVENT(btrfs__ordered_extent, btrfs_ordered_extent_put,
TP_PROTO(struct inode *inode, struct btrfs_ordered_extent *ordered), TP_PROTO(const struct inode *inode,
const struct btrfs_ordered_extent *ordered),
TP_ARGS(inode, ordered) TP_ARGS(inode, ordered)
); );
DECLARE_EVENT_CLASS(btrfs__writepage, DECLARE_EVENT_CLASS(btrfs__writepage,
TP_PROTO(struct page *page, struct inode *inode, TP_PROTO(const struct page *page, const struct inode *inode,
struct writeback_control *wbc), const struct writeback_control *wbc),
TP_ARGS(page, inode, wbc), TP_ARGS(page, inode, wbc),
@ -517,15 +522,15 @@ DECLARE_EVENT_CLASS(btrfs__writepage,
DEFINE_EVENT(btrfs__writepage, __extent_writepage, DEFINE_EVENT(btrfs__writepage, __extent_writepage,
TP_PROTO(struct page *page, struct inode *inode, TP_PROTO(const struct page *page, const struct inode *inode,
struct writeback_control *wbc), const struct writeback_control *wbc),
TP_ARGS(page, inode, wbc) TP_ARGS(page, inode, wbc)
); );
TRACE_EVENT(btrfs_writepage_end_io_hook, TRACE_EVENT(btrfs_writepage_end_io_hook,
TP_PROTO(struct page *page, u64 start, u64 end, int uptodate), TP_PROTO(const struct page *page, u64 start, u64 end, int uptodate),
TP_ARGS(page, start, end, uptodate), TP_ARGS(page, start, end, uptodate),
@ -558,7 +563,7 @@ TRACE_EVENT(btrfs_writepage_end_io_hook,
TRACE_EVENT(btrfs_sync_file, TRACE_EVENT(btrfs_sync_file,
TP_PROTO(struct file *file, int datasync), TP_PROTO(const struct file *file, int datasync),
TP_ARGS(file, datasync), TP_ARGS(file, datasync),
@ -570,8 +575,8 @@ TRACE_EVENT(btrfs_sync_file,
), ),
TP_fast_assign( TP_fast_assign(
struct dentry *dentry = file->f_path.dentry; const struct dentry *dentry = file->f_path.dentry;
struct inode *inode = d_inode(dentry); const struct inode *inode = d_inode(dentry);
TP_fast_assign_fsid(btrfs_sb(file->f_path.dentry->d_sb)); TP_fast_assign_fsid(btrfs_sb(file->f_path.dentry->d_sb));
__entry->ino = inode->i_ino; __entry->ino = inode->i_ino;
@ -589,7 +594,7 @@ TRACE_EVENT(btrfs_sync_file,
TRACE_EVENT(btrfs_sync_fs, TRACE_EVENT(btrfs_sync_fs,
TP_PROTO(struct btrfs_fs_info *fs_info, int wait), TP_PROTO(const struct btrfs_fs_info *fs_info, int wait),
TP_ARGS(fs_info, wait), TP_ARGS(fs_info, wait),
@ -606,8 +611,8 @@ TRACE_EVENT(btrfs_sync_fs,
TRACE_EVENT(btrfs_add_block_group, TRACE_EVENT(btrfs_add_block_group,
TP_PROTO(struct btrfs_fs_info *fs_info, TP_PROTO(const struct btrfs_fs_info *fs_info,
struct btrfs_block_group_cache *block_group, int create), const struct btrfs_block_group_cache *block_group, int create),
TP_ARGS(fs_info, block_group, create), TP_ARGS(fs_info, block_group, create),
@ -654,9 +659,9 @@ TRACE_EVENT(btrfs_add_block_group,
DECLARE_EVENT_CLASS(btrfs_delayed_tree_ref, DECLARE_EVENT_CLASS(btrfs_delayed_tree_ref,
TP_PROTO(struct btrfs_fs_info *fs_info, TP_PROTO(const struct btrfs_fs_info *fs_info,
struct btrfs_delayed_ref_node *ref, const struct btrfs_delayed_ref_node *ref,
struct btrfs_delayed_tree_ref *full_ref, const struct btrfs_delayed_tree_ref *full_ref,
int action), int action),
TP_ARGS(fs_info, ref, full_ref, action), TP_ARGS(fs_info, ref, full_ref, action),
@ -697,9 +702,9 @@ DECLARE_EVENT_CLASS(btrfs_delayed_tree_ref,
DEFINE_EVENT(btrfs_delayed_tree_ref, add_delayed_tree_ref, DEFINE_EVENT(btrfs_delayed_tree_ref, add_delayed_tree_ref,
TP_PROTO(struct btrfs_fs_info *fs_info, TP_PROTO(const struct btrfs_fs_info *fs_info,
struct btrfs_delayed_ref_node *ref, const struct btrfs_delayed_ref_node *ref,
struct btrfs_delayed_tree_ref *full_ref, const struct btrfs_delayed_tree_ref *full_ref,
int action), int action),
TP_ARGS(fs_info, ref, full_ref, action) TP_ARGS(fs_info, ref, full_ref, action)
@ -707,9 +712,9 @@ DEFINE_EVENT(btrfs_delayed_tree_ref, add_delayed_tree_ref,
DEFINE_EVENT(btrfs_delayed_tree_ref, run_delayed_tree_ref, DEFINE_EVENT(btrfs_delayed_tree_ref, run_delayed_tree_ref,
TP_PROTO(struct btrfs_fs_info *fs_info, TP_PROTO(const struct btrfs_fs_info *fs_info,
struct btrfs_delayed_ref_node *ref, const struct btrfs_delayed_ref_node *ref,
struct btrfs_delayed_tree_ref *full_ref, const struct btrfs_delayed_tree_ref *full_ref,
int action), int action),
TP_ARGS(fs_info, ref, full_ref, action) TP_ARGS(fs_info, ref, full_ref, action)
@ -717,9 +722,9 @@ DEFINE_EVENT(btrfs_delayed_tree_ref, run_delayed_tree_ref,
DECLARE_EVENT_CLASS(btrfs_delayed_data_ref, DECLARE_EVENT_CLASS(btrfs_delayed_data_ref,
TP_PROTO(struct btrfs_fs_info *fs_info, TP_PROTO(const struct btrfs_fs_info *fs_info,
struct btrfs_delayed_ref_node *ref, const struct btrfs_delayed_ref_node *ref,
struct btrfs_delayed_data_ref *full_ref, const struct btrfs_delayed_data_ref *full_ref,
int action), int action),
TP_ARGS(fs_info, ref, full_ref, action), TP_ARGS(fs_info, ref, full_ref, action),
@ -764,9 +769,9 @@ DECLARE_EVENT_CLASS(btrfs_delayed_data_ref,
DEFINE_EVENT(btrfs_delayed_data_ref, add_delayed_data_ref, DEFINE_EVENT(btrfs_delayed_data_ref, add_delayed_data_ref,
TP_PROTO(struct btrfs_fs_info *fs_info, TP_PROTO(const struct btrfs_fs_info *fs_info,
struct btrfs_delayed_ref_node *ref, const struct btrfs_delayed_ref_node *ref,
struct btrfs_delayed_data_ref *full_ref, const struct btrfs_delayed_data_ref *full_ref,
int action), int action),
TP_ARGS(fs_info, ref, full_ref, action) TP_ARGS(fs_info, ref, full_ref, action)
@ -774,9 +779,9 @@ DEFINE_EVENT(btrfs_delayed_data_ref, add_delayed_data_ref,
DEFINE_EVENT(btrfs_delayed_data_ref, run_delayed_data_ref, DEFINE_EVENT(btrfs_delayed_data_ref, run_delayed_data_ref,
TP_PROTO(struct btrfs_fs_info *fs_info, TP_PROTO(const struct btrfs_fs_info *fs_info,
struct btrfs_delayed_ref_node *ref, const struct btrfs_delayed_ref_node *ref,
struct btrfs_delayed_data_ref *full_ref, const struct btrfs_delayed_data_ref *full_ref,
int action), int action),
TP_ARGS(fs_info, ref, full_ref, action) TP_ARGS(fs_info, ref, full_ref, action)
@ -784,9 +789,9 @@ DEFINE_EVENT(btrfs_delayed_data_ref, run_delayed_data_ref,
DECLARE_EVENT_CLASS(btrfs_delayed_ref_head, DECLARE_EVENT_CLASS(btrfs_delayed_ref_head,
TP_PROTO(struct btrfs_fs_info *fs_info, TP_PROTO(const struct btrfs_fs_info *fs_info,
struct btrfs_delayed_ref_node *ref, const struct btrfs_delayed_ref_node *ref,
struct btrfs_delayed_ref_head *head_ref, const struct btrfs_delayed_ref_head *head_ref,
int action), int action),
TP_ARGS(fs_info, ref, head_ref, action), TP_ARGS(fs_info, ref, head_ref, action),
@ -814,9 +819,9 @@ DECLARE_EVENT_CLASS(btrfs_delayed_ref_head,
DEFINE_EVENT(btrfs_delayed_ref_head, add_delayed_ref_head, DEFINE_EVENT(btrfs_delayed_ref_head, add_delayed_ref_head,
TP_PROTO(struct btrfs_fs_info *fs_info, TP_PROTO(const struct btrfs_fs_info *fs_info,
struct btrfs_delayed_ref_node *ref, const struct btrfs_delayed_ref_node *ref,
struct btrfs_delayed_ref_head *head_ref, const struct btrfs_delayed_ref_head *head_ref,
int action), int action),
TP_ARGS(fs_info, ref, head_ref, action) TP_ARGS(fs_info, ref, head_ref, action)
@ -824,9 +829,9 @@ DEFINE_EVENT(btrfs_delayed_ref_head, add_delayed_ref_head,
DEFINE_EVENT(btrfs_delayed_ref_head, run_delayed_ref_head, DEFINE_EVENT(btrfs_delayed_ref_head, run_delayed_ref_head,
TP_PROTO(struct btrfs_fs_info *fs_info, TP_PROTO(const struct btrfs_fs_info *fs_info,
struct btrfs_delayed_ref_node *ref, const struct btrfs_delayed_ref_node *ref,
struct btrfs_delayed_ref_head *head_ref, const struct btrfs_delayed_ref_head *head_ref,
int action), int action),
TP_ARGS(fs_info, ref, head_ref, action) TP_ARGS(fs_info, ref, head_ref, action)
@ -846,8 +851,8 @@ DEFINE_EVENT(btrfs_delayed_ref_head, run_delayed_ref_head,
DECLARE_EVENT_CLASS(btrfs__chunk, DECLARE_EVENT_CLASS(btrfs__chunk,
TP_PROTO(struct btrfs_fs_info *fs_info, struct map_lookup *map, TP_PROTO(const struct btrfs_fs_info *fs_info,
u64 offset, u64 size), const struct map_lookup *map, u64 offset, u64 size),
TP_ARGS(fs_info, map, offset, size), TP_ARGS(fs_info, map, offset, size),
@ -880,24 +885,24 @@ DECLARE_EVENT_CLASS(btrfs__chunk,
DEFINE_EVENT(btrfs__chunk, btrfs_chunk_alloc, DEFINE_EVENT(btrfs__chunk, btrfs_chunk_alloc,
TP_PROTO(struct btrfs_fs_info *fs_info, struct map_lookup *map, TP_PROTO(const struct btrfs_fs_info *fs_info,
u64 offset, u64 size), const struct map_lookup *map, u64 offset, u64 size),
TP_ARGS(fs_info, map, offset, size) TP_ARGS(fs_info, map, offset, size)
); );
DEFINE_EVENT(btrfs__chunk, btrfs_chunk_free, DEFINE_EVENT(btrfs__chunk, btrfs_chunk_free,
TP_PROTO(struct btrfs_fs_info *fs_info, struct map_lookup *map, TP_PROTO(const struct btrfs_fs_info *fs_info,
u64 offset, u64 size), const struct map_lookup *map, u64 offset, u64 size),
TP_ARGS(fs_info, map, offset, size) TP_ARGS(fs_info, map, offset, size)
); );
TRACE_EVENT(btrfs_cow_block, TRACE_EVENT(btrfs_cow_block,
TP_PROTO(struct btrfs_root *root, struct extent_buffer *buf, TP_PROTO(const struct btrfs_root *root, const struct extent_buffer *buf,
struct extent_buffer *cow), const struct extent_buffer *cow),
TP_ARGS(root, buf, cow), TP_ARGS(root, buf, cow),
@ -931,7 +936,7 @@ TRACE_EVENT(btrfs_cow_block,
TRACE_EVENT(btrfs_space_reservation, TRACE_EVENT(btrfs_space_reservation,
TP_PROTO(struct btrfs_fs_info *fs_info, char *type, u64 val, TP_PROTO(const struct btrfs_fs_info *fs_info, char *type, u64 val,
u64 bytes, int reserve), u64 bytes, int reserve),
TP_ARGS(fs_info, type, val, bytes, reserve), TP_ARGS(fs_info, type, val, bytes, reserve),
@ -963,7 +968,7 @@ TRACE_EVENT(btrfs_space_reservation,
TRACE_EVENT(btrfs_trigger_flush, TRACE_EVENT(btrfs_trigger_flush,
TP_PROTO(struct btrfs_fs_info *fs_info, u64 flags, u64 bytes, TP_PROTO(const struct btrfs_fs_info *fs_info, u64 flags, u64 bytes,
int flush, char *reason), int flush, char *reason),
TP_ARGS(fs_info, flags, bytes, flush, reason), TP_ARGS(fs_info, flags, bytes, flush, reason),
@ -1004,7 +1009,7 @@ TRACE_EVENT(btrfs_trigger_flush,
TRACE_EVENT(btrfs_flush_space, TRACE_EVENT(btrfs_flush_space,
TP_PROTO(struct btrfs_fs_info *fs_info, u64 flags, u64 num_bytes, TP_PROTO(const struct btrfs_fs_info *fs_info, u64 flags, u64 num_bytes,
u64 orig_bytes, int state, int ret), u64 orig_bytes, int state, int ret),
TP_ARGS(fs_info, flags, num_bytes, orig_bytes, state, ret), TP_ARGS(fs_info, flags, num_bytes, orig_bytes, state, ret),
@ -1039,7 +1044,7 @@ TRACE_EVENT(btrfs_flush_space,
DECLARE_EVENT_CLASS(btrfs__reserved_extent, DECLARE_EVENT_CLASS(btrfs__reserved_extent,
TP_PROTO(struct btrfs_fs_info *fs_info, u64 start, u64 len), TP_PROTO(const struct btrfs_fs_info *fs_info, u64 start, u64 len),
TP_ARGS(fs_info, start, len), TP_ARGS(fs_info, start, len),
@ -1061,22 +1066,22 @@ DECLARE_EVENT_CLASS(btrfs__reserved_extent,
DEFINE_EVENT(btrfs__reserved_extent, btrfs_reserved_extent_alloc, DEFINE_EVENT(btrfs__reserved_extent, btrfs_reserved_extent_alloc,
TP_PROTO(struct btrfs_fs_info *fs_info, u64 start, u64 len), TP_PROTO(const struct btrfs_fs_info *fs_info, u64 start, u64 len),
TP_ARGS(fs_info, start, len) TP_ARGS(fs_info, start, len)
); );
DEFINE_EVENT(btrfs__reserved_extent, btrfs_reserved_extent_free, DEFINE_EVENT(btrfs__reserved_extent, btrfs_reserved_extent_free,
TP_PROTO(struct btrfs_fs_info *fs_info, u64 start, u64 len), TP_PROTO(const struct btrfs_fs_info *fs_info, u64 start, u64 len),
TP_ARGS(fs_info, start, len) TP_ARGS(fs_info, start, len)
); );
TRACE_EVENT(find_free_extent, TRACE_EVENT(find_free_extent,
TP_PROTO(struct btrfs_fs_info *fs_info, u64 num_bytes, u64 empty_size, TP_PROTO(const struct btrfs_fs_info *fs_info, u64 num_bytes,
u64 data), u64 empty_size, u64 data),
TP_ARGS(fs_info, num_bytes, empty_size, data), TP_ARGS(fs_info, num_bytes, empty_size, data),
@ -1101,8 +1106,8 @@ TRACE_EVENT(find_free_extent,
DECLARE_EVENT_CLASS(btrfs__reserve_extent, DECLARE_EVENT_CLASS(btrfs__reserve_extent,
TP_PROTO(struct btrfs_fs_info *fs_info, TP_PROTO(const struct btrfs_fs_info *fs_info,
struct btrfs_block_group_cache *block_group, u64 start, const struct btrfs_block_group_cache *block_group, u64 start,
u64 len), u64 len),
TP_ARGS(fs_info, block_group, start, len), TP_ARGS(fs_info, block_group, start, len),
@ -1132,8 +1137,8 @@ DECLARE_EVENT_CLASS(btrfs__reserve_extent,
DEFINE_EVENT(btrfs__reserve_extent, btrfs_reserve_extent, DEFINE_EVENT(btrfs__reserve_extent, btrfs_reserve_extent,
TP_PROTO(struct btrfs_fs_info *fs_info, TP_PROTO(const struct btrfs_fs_info *fs_info,
struct btrfs_block_group_cache *block_group, u64 start, const struct btrfs_block_group_cache *block_group, u64 start,
u64 len), u64 len),
TP_ARGS(fs_info, block_group, start, len) TP_ARGS(fs_info, block_group, start, len)
@ -1141,8 +1146,8 @@ DEFINE_EVENT(btrfs__reserve_extent, btrfs_reserve_extent,
DEFINE_EVENT(btrfs__reserve_extent, btrfs_reserve_extent_cluster, DEFINE_EVENT(btrfs__reserve_extent, btrfs_reserve_extent_cluster,
TP_PROTO(struct btrfs_fs_info *fs_info, TP_PROTO(const struct btrfs_fs_info *fs_info,
struct btrfs_block_group_cache *block_group, u64 start, const struct btrfs_block_group_cache *block_group, u64 start,
u64 len), u64 len),
TP_ARGS(fs_info, block_group, start, len) TP_ARGS(fs_info, block_group, start, len)
@ -1150,7 +1155,7 @@ DEFINE_EVENT(btrfs__reserve_extent, btrfs_reserve_extent_cluster,
TRACE_EVENT(btrfs_find_cluster, TRACE_EVENT(btrfs_find_cluster,
TP_PROTO(struct btrfs_block_group_cache *block_group, u64 start, TP_PROTO(const struct btrfs_block_group_cache *block_group, u64 start,
u64 bytes, u64 empty_size, u64 min_bytes), u64 bytes, u64 empty_size, u64 min_bytes),
TP_ARGS(block_group, start, bytes, empty_size, min_bytes), TP_ARGS(block_group, start, bytes, empty_size, min_bytes),
@ -1183,7 +1188,7 @@ TRACE_EVENT(btrfs_find_cluster,
TRACE_EVENT(btrfs_failed_cluster_setup, TRACE_EVENT(btrfs_failed_cluster_setup,
TP_PROTO(struct btrfs_block_group_cache *block_group), TP_PROTO(const struct btrfs_block_group_cache *block_group),
TP_ARGS(block_group), TP_ARGS(block_group),
@ -1200,8 +1205,9 @@ TRACE_EVENT(btrfs_failed_cluster_setup,
TRACE_EVENT(btrfs_setup_cluster, TRACE_EVENT(btrfs_setup_cluster,
TP_PROTO(struct btrfs_block_group_cache *block_group, TP_PROTO(const struct btrfs_block_group_cache *block_group,
struct btrfs_free_cluster *cluster, u64 size, int bitmap), const struct btrfs_free_cluster *cluster,
u64 size, int bitmap),
TP_ARGS(block_group, cluster, size, bitmap), TP_ARGS(block_group, cluster, size, bitmap),
@ -1235,12 +1241,13 @@ TRACE_EVENT(btrfs_setup_cluster,
struct extent_state; struct extent_state;
TRACE_EVENT(alloc_extent_state, TRACE_EVENT(alloc_extent_state,
TP_PROTO(struct extent_state *state, gfp_t mask, unsigned long IP), TP_PROTO(const struct extent_state *state,
gfp_t mask, unsigned long IP),
TP_ARGS(state, mask, IP), TP_ARGS(state, mask, IP),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(struct extent_state *, state) __field(const struct extent_state *, state)
__field(gfp_t, mask) __field(gfp_t, mask)
__field(unsigned long, ip) __field(unsigned long, ip)
), ),
@ -1252,17 +1259,17 @@ TRACE_EVENT(alloc_extent_state,
), ),
TP_printk("state=%p mask=%s caller=%pS", __entry->state, TP_printk("state=%p mask=%s caller=%pS", __entry->state,
show_gfp_flags(__entry->mask), (void *)__entry->ip) show_gfp_flags(__entry->mask), (const void *)__entry->ip)
); );
TRACE_EVENT(free_extent_state, TRACE_EVENT(free_extent_state,
TP_PROTO(struct extent_state *state, unsigned long IP), TP_PROTO(const struct extent_state *state, unsigned long IP),
TP_ARGS(state, IP), TP_ARGS(state, IP),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(struct extent_state *, state) __field(const struct extent_state *, state)
__field(unsigned long, ip) __field(unsigned long, ip)
), ),
@ -1272,22 +1279,22 @@ TRACE_EVENT(free_extent_state,
), ),
TP_printk("state=%p caller=%pS", __entry->state, TP_printk("state=%p caller=%pS", __entry->state,
(void *)__entry->ip) (const void *)__entry->ip)
); );
DECLARE_EVENT_CLASS(btrfs__work, DECLARE_EVENT_CLASS(btrfs__work,
TP_PROTO(struct btrfs_work *work), TP_PROTO(const struct btrfs_work *work),
TP_ARGS(work), TP_ARGS(work),
TP_STRUCT__entry_btrfs( TP_STRUCT__entry_btrfs(
__field( void *, work ) __field( const void *, work )
__field( void *, wq ) __field( const void *, wq )
__field( void *, func ) __field( const void *, func )
__field( void *, ordered_func ) __field( const void *, ordered_func )
__field( void *, ordered_free ) __field( const void *, ordered_free )
__field( void *, normal_work ) __field( const void *, normal_work )
), ),
TP_fast_assign_btrfs(btrfs_work_owner(work), TP_fast_assign_btrfs(btrfs_work_owner(work),
@ -1312,12 +1319,12 @@ DECLARE_EVENT_CLASS(btrfs__work,
*/ */
DECLARE_EVENT_CLASS(btrfs__work__done, DECLARE_EVENT_CLASS(btrfs__work__done,
TP_PROTO(struct btrfs_fs_info *fs_info, void *wtag), TP_PROTO(const struct btrfs_fs_info *fs_info, const void *wtag),
TP_ARGS(fs_info, wtag), TP_ARGS(fs_info, wtag),
TP_STRUCT__entry_btrfs( TP_STRUCT__entry_btrfs(
__field( void *, wtag ) __field( const void *, wtag )
), ),
TP_fast_assign_btrfs(fs_info, TP_fast_assign_btrfs(fs_info,
@ -1329,40 +1336,41 @@ DECLARE_EVENT_CLASS(btrfs__work__done,
DEFINE_EVENT(btrfs__work, btrfs_work_queued, DEFINE_EVENT(btrfs__work, btrfs_work_queued,
TP_PROTO(struct btrfs_work *work), TP_PROTO(const struct btrfs_work *work),
TP_ARGS(work) TP_ARGS(work)
); );
DEFINE_EVENT(btrfs__work, btrfs_work_sched, DEFINE_EVENT(btrfs__work, btrfs_work_sched,
TP_PROTO(struct btrfs_work *work), TP_PROTO(const struct btrfs_work *work),
TP_ARGS(work) TP_ARGS(work)
); );
DEFINE_EVENT(btrfs__work__done, btrfs_all_work_done, DEFINE_EVENT(btrfs__work__done, btrfs_all_work_done,
TP_PROTO(struct btrfs_fs_info *fs_info, void *wtag), TP_PROTO(const struct btrfs_fs_info *fs_info, const void *wtag),
TP_ARGS(fs_info, wtag) TP_ARGS(fs_info, wtag)
); );
DEFINE_EVENT(btrfs__work, btrfs_ordered_sched, DEFINE_EVENT(btrfs__work, btrfs_ordered_sched,
TP_PROTO(struct btrfs_work *work), TP_PROTO(const struct btrfs_work *work),
TP_ARGS(work) TP_ARGS(work)
); );
DECLARE_EVENT_CLASS(btrfs__workqueue, DECLARE_EVENT_CLASS(btrfs__workqueue,
TP_PROTO(struct __btrfs_workqueue *wq, const char *name, int high), TP_PROTO(const struct __btrfs_workqueue *wq,
const char *name, int high),
TP_ARGS(wq, name, high), TP_ARGS(wq, name, high),
TP_STRUCT__entry_btrfs( TP_STRUCT__entry_btrfs(
__field( void *, wq ) __field( const void *, wq )
__string( name, name ) __string( name, name )
__field( int , high ) __field( int , high )
), ),
@ -1381,19 +1389,20 @@ DECLARE_EVENT_CLASS(btrfs__workqueue,
DEFINE_EVENT(btrfs__workqueue, btrfs_workqueue_alloc, DEFINE_EVENT(btrfs__workqueue, btrfs_workqueue_alloc,
TP_PROTO(struct __btrfs_workqueue *wq, const char *name, int high), TP_PROTO(const struct __btrfs_workqueue *wq,
const char *name, int high),
TP_ARGS(wq, name, high) TP_ARGS(wq, name, high)
); );
DECLARE_EVENT_CLASS(btrfs__workqueue_done, DECLARE_EVENT_CLASS(btrfs__workqueue_done,
TP_PROTO(struct __btrfs_workqueue *wq), TP_PROTO(const struct __btrfs_workqueue *wq),
TP_ARGS(wq), TP_ARGS(wq),
TP_STRUCT__entry_btrfs( TP_STRUCT__entry_btrfs(
__field( void *, wq ) __field( const void *, wq )
), ),
TP_fast_assign_btrfs(btrfs_workqueue_owner(wq), TP_fast_assign_btrfs(btrfs_workqueue_owner(wq),
@ -1405,7 +1414,7 @@ DECLARE_EVENT_CLASS(btrfs__workqueue_done,
DEFINE_EVENT(btrfs__workqueue_done, btrfs_workqueue_destroy, DEFINE_EVENT(btrfs__workqueue_done, btrfs_workqueue_destroy,
TP_PROTO(struct __btrfs_workqueue *wq), TP_PROTO(const struct __btrfs_workqueue *wq),
TP_ARGS(wq) TP_ARGS(wq)
); );
@ -1417,7 +1426,8 @@ DEFINE_EVENT(btrfs__workqueue_done, btrfs_workqueue_destroy,
DECLARE_EVENT_CLASS(btrfs__qgroup_rsv_data, DECLARE_EVENT_CLASS(btrfs__qgroup_rsv_data,
TP_PROTO(struct inode *inode, u64 start, u64 len, u64 reserved, int op), TP_PROTO(const struct inode *inode, u64 start, u64 len,
u64 reserved, int op),
TP_ARGS(inode, start, len, reserved, op), TP_ARGS(inode, start, len, reserved, op),
@ -1449,21 +1459,24 @@ DECLARE_EVENT_CLASS(btrfs__qgroup_rsv_data,
DEFINE_EVENT(btrfs__qgroup_rsv_data, btrfs_qgroup_reserve_data, DEFINE_EVENT(btrfs__qgroup_rsv_data, btrfs_qgroup_reserve_data,
TP_PROTO(struct inode *inode, u64 start, u64 len, u64 reserved, int op), TP_PROTO(const struct inode *inode, u64 start, u64 len,
u64 reserved, int op),
TP_ARGS(inode, start, len, reserved, op) TP_ARGS(inode, start, len, reserved, op)
); );
DEFINE_EVENT(btrfs__qgroup_rsv_data, btrfs_qgroup_release_data, DEFINE_EVENT(btrfs__qgroup_rsv_data, btrfs_qgroup_release_data,
TP_PROTO(struct inode *inode, u64 start, u64 len, u64 reserved, int op), TP_PROTO(const struct inode *inode, u64 start, u64 len,
u64 reserved, int op),
TP_ARGS(inode, start, len, reserved, op) TP_ARGS(inode, start, len, reserved, op)
); );
DECLARE_EVENT_CLASS(btrfs__qgroup_delayed_ref, DECLARE_EVENT_CLASS(btrfs__qgroup_delayed_ref,
TP_PROTO(struct btrfs_fs_info *fs_info, u64 ref_root, u64 reserved), TP_PROTO(const struct btrfs_fs_info *fs_info,
u64 ref_root, u64 reserved),
TP_ARGS(fs_info, ref_root, reserved), TP_ARGS(fs_info, ref_root, reserved),
@ -1483,14 +1496,15 @@ DECLARE_EVENT_CLASS(btrfs__qgroup_delayed_ref,
DEFINE_EVENT(btrfs__qgroup_delayed_ref, btrfs_qgroup_free_delayed_ref, DEFINE_EVENT(btrfs__qgroup_delayed_ref, btrfs_qgroup_free_delayed_ref,
TP_PROTO(struct btrfs_fs_info *fs_info, u64 ref_root, u64 reserved), TP_PROTO(const struct btrfs_fs_info *fs_info,
u64 ref_root, u64 reserved),
TP_ARGS(fs_info, ref_root, reserved) TP_ARGS(fs_info, ref_root, reserved)
); );
DECLARE_EVENT_CLASS(btrfs_qgroup_extent, DECLARE_EVENT_CLASS(btrfs_qgroup_extent,
TP_PROTO(struct btrfs_fs_info *fs_info, TP_PROTO(const struct btrfs_fs_info *fs_info,
struct btrfs_qgroup_extent_record *rec), const struct btrfs_qgroup_extent_record *rec),
TP_ARGS(fs_info, rec), TP_ARGS(fs_info, rec),
@ -1511,23 +1525,23 @@ DECLARE_EVENT_CLASS(btrfs_qgroup_extent,
DEFINE_EVENT(btrfs_qgroup_extent, btrfs_qgroup_account_extents, DEFINE_EVENT(btrfs_qgroup_extent, btrfs_qgroup_account_extents,
TP_PROTO(struct btrfs_fs_info *fs_info, TP_PROTO(const struct btrfs_fs_info *fs_info,
struct btrfs_qgroup_extent_record *rec), const struct btrfs_qgroup_extent_record *rec),
TP_ARGS(fs_info, rec) TP_ARGS(fs_info, rec)
); );
DEFINE_EVENT(btrfs_qgroup_extent, btrfs_qgroup_trace_extent, DEFINE_EVENT(btrfs_qgroup_extent, btrfs_qgroup_trace_extent,
TP_PROTO(struct btrfs_fs_info *fs_info, TP_PROTO(const struct btrfs_fs_info *fs_info,
struct btrfs_qgroup_extent_record *rec), const struct btrfs_qgroup_extent_record *rec),
TP_ARGS(fs_info, rec) TP_ARGS(fs_info, rec)
); );
TRACE_EVENT(btrfs_qgroup_account_extent, TRACE_EVENT(btrfs_qgroup_account_extent,
TP_PROTO(struct btrfs_fs_info *fs_info, u64 bytenr, TP_PROTO(const struct btrfs_fs_info *fs_info, u64 bytenr,
u64 num_bytes, u64 nr_old_roots, u64 nr_new_roots), u64 num_bytes, u64 nr_old_roots, u64 nr_new_roots),
TP_ARGS(fs_info, bytenr, num_bytes, nr_old_roots, nr_new_roots), TP_ARGS(fs_info, bytenr, num_bytes, nr_old_roots, nr_new_roots),
@ -1556,7 +1570,7 @@ TRACE_EVENT(btrfs_qgroup_account_extent,
TRACE_EVENT(qgroup_update_counters, TRACE_EVENT(qgroup_update_counters,
TP_PROTO(struct btrfs_fs_info *fs_info, u64 qgid, TP_PROTO(const struct btrfs_fs_info *fs_info, u64 qgid,
u64 cur_old_count, u64 cur_new_count), u64 cur_old_count, u64 cur_new_count),
TP_ARGS(fs_info, qgid, cur_old_count, cur_new_count), TP_ARGS(fs_info, qgid, cur_old_count, cur_new_count),