Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 6556d1df 编写于 作者: S Steven Rostedt 提交者： Steven Rostedt
浏览文件
操作

tracing: fix the block trace points print size 

The sector field is either u64 or unsigned long depending on
the arch. This patch casts the sector to unsigned long long to
prevent the printf warnings.

[ Impact: remove compile warnings ]
Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
上级 55782138
隐藏空白更改
内联 并排
Showing with 30 addition and 15 deletion
include/trace/events/block.h
浏览文件 @ 6556d1df
...@@ -37,7 +37,8 @@ TRACE_EVENT(block_rq_abort, ...@@ -37,7 +37,8 @@ TRACE_EVENT(block_rq_abort,
TP_printk("%d,%d %s (%s) %llu + %u [%d]", TP_printk("%d,%d %s (%s) %llu + %u [%d]",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->rwbs, __get_str(cmd), __entry->rwbs, __get_str(cmd),
__entry->sector, __entry->nr_sector, __entry->errors) (unsigned long long)__entry->sector,
__entry->nr_sector, __entry->errors)
); );
TRACE_EVENT(block_rq_insert, TRACE_EVENT(block_rq_insert,
...@@ -71,7 +72,8 @@ TRACE_EVENT(block_rq_insert, ...@@ -71,7 +72,8 @@ TRACE_EVENT(block_rq_insert,
TP_printk("%d,%d %s %u (%s) %llu + %u [%s]", TP_printk("%d,%d %s %u (%s) %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->rwbs, __entry->bytes, __get_str(cmd), __entry->rwbs, __entry->bytes, __get_str(cmd),
__entry->sector, __entry->nr_sector, __entry->comm) (unsigned long long)__entry->sector,
__entry->nr_sector, __entry->comm)
); );
TRACE_EVENT(block_rq_issue, TRACE_EVENT(block_rq_issue,
...@@ -105,7 +107,8 @@ TRACE_EVENT(block_rq_issue, ...@@ -105,7 +107,8 @@ TRACE_EVENT(block_rq_issue,
TP_printk("%d,%d %s %u (%s) %llu + %u [%s]", TP_printk("%d,%d %s %u (%s) %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->rwbs, __entry->bytes, __get_str(cmd), __entry->rwbs, __entry->bytes, __get_str(cmd),
__entry->sector, __entry->nr_sector, __entry->comm) (unsigned long long)__entry->sector,
__entry->nr_sector, __entry->comm)
); );
TRACE_EVENT(block_rq_requeue, TRACE_EVENT(block_rq_requeue,
...@@ -137,7 +140,8 @@ TRACE_EVENT(block_rq_requeue, ...@@ -137,7 +140,8 @@ TRACE_EVENT(block_rq_requeue,
TP_printk("%d,%d %s (%s) %llu + %u [%d]", TP_printk("%d,%d %s (%s) %llu + %u [%d]",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->rwbs, __get_str(cmd), __entry->rwbs, __get_str(cmd),
__entry->sector, __entry->nr_sector, __entry->errors) (unsigned long long)__entry->sector,
__entry->nr_sector, __entry->errors)
); );
TRACE_EVENT(block_rq_complete, TRACE_EVENT(block_rq_complete,
...@@ -169,7 +173,8 @@ TRACE_EVENT(block_rq_complete, ...@@ -169,7 +173,8 @@ TRACE_EVENT(block_rq_complete,
TP_printk("%d,%d %s (%s) %llu + %u [%d]", TP_printk("%d,%d %s (%s) %llu + %u [%d]",
MAJOR(__entry->dev), MINOR(__entry->dev), MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->rwbs, __get_str(cmd), __entry->rwbs, __get_str(cmd),
__entry->sector, __entry->nr_sector, __entry->errors) (unsigned long long)__entry->sector,
__entry->nr_sector, __entry->errors)
); );
TRACE_EVENT(block_bio_bounce, TRACE_EVENT(block_bio_bounce,
...@@ -195,7 +200,8 @@ TRACE_EVENT(block_bio_bounce, ...@@ -195,7 +200,8 @@ TRACE_EVENT(block_bio_bounce,
TP_printk("%d,%d %s %llu + %u [%s]", TP_printk("%d,%d %s %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
__entry->sector, __entry->nr_sector, __entry->comm) (unsigned long long)__entry->sector,
__entry->nr_sector, __entry->comm)
); );
TRACE_EVENT(block_bio_complete, TRACE_EVENT(block_bio_complete,
...@@ -221,7 +227,8 @@ TRACE_EVENT(block_bio_complete, ...@@ -221,7 +227,8 @@ TRACE_EVENT(block_bio_complete,
TP_printk("%d,%d %s %llu + %u [%d]", TP_printk("%d,%d %s %llu + %u [%d]",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
__entry->sector, __entry->nr_sector, __entry->error) (unsigned long long)__entry->sector,
__entry->nr_sector, __entry->error)
); );
TRACE_EVENT(block_bio_backmerge, TRACE_EVENT(block_bio_backmerge,
...@@ -248,7 +255,8 @@ TRACE_EVENT(block_bio_backmerge, ...@@ -248,7 +255,8 @@ TRACE_EVENT(block_bio_backmerge,
TP_printk("%d,%d %s %llu + %u [%s]", TP_printk("%d,%d %s %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
__entry->sector, __entry->nr_sector, __entry->comm) (unsigned long long)__entry->sector,
__entry->nr_sector, __entry->comm)
); );
TRACE_EVENT(block_bio_frontmerge, TRACE_EVENT(block_bio_frontmerge,
...@@ -275,7 +283,8 @@ TRACE_EVENT(block_bio_frontmerge, ...@@ -275,7 +283,8 @@ TRACE_EVENT(block_bio_frontmerge,
TP_printk("%d,%d %s %llu + %u [%s]", TP_printk("%d,%d %s %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
__entry->sector, __entry->nr_sector, __entry->comm) (unsigned long long)__entry->sector,
__entry->nr_sector, __entry->comm)
); );
TRACE_EVENT(block_bio_queue, TRACE_EVENT(block_bio_queue,
...@@ -302,7 +311,8 @@ TRACE_EVENT(block_bio_queue, ...@@ -302,7 +311,8 @@ TRACE_EVENT(block_bio_queue,
TP_printk("%d,%d %s %llu + %u [%s]", TP_printk("%d,%d %s %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
__entry->sector, __entry->nr_sector, __entry->comm) (unsigned long long)__entry->sector,
__entry->nr_sector, __entry->comm)
); );
TRACE_EVENT(block_getrq, TRACE_EVENT(block_getrq,
...@@ -330,7 +340,8 @@ TRACE_EVENT(block_getrq, ...@@ -330,7 +340,8 @@ TRACE_EVENT(block_getrq,
TP_printk("%d,%d %s %llu + %u [%s]", TP_printk("%d,%d %s %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
__entry->sector, __entry->nr_sector, __entry->comm) (unsigned long long)__entry->sector,
__entry->nr_sector, __entry->comm)
); );
TRACE_EVENT(block_sleeprq, TRACE_EVENT(block_sleeprq,
...@@ -358,7 +369,8 @@ TRACE_EVENT(block_sleeprq, ...@@ -358,7 +369,8 @@ TRACE_EVENT(block_sleeprq,
TP_printk("%d,%d %s %llu + %u [%s]", TP_printk("%d,%d %s %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
__entry->sector, __entry->nr_sector, __entry->comm) (unsigned long long)__entry->sector,
__entry->nr_sector, __entry->comm)
); );
TRACE_EVENT(block_plug, TRACE_EVENT(block_plug,
...@@ -441,7 +453,9 @@ TRACE_EVENT(block_split, ...@@ -441,7 +453,9 @@ TRACE_EVENT(block_split,
TP_printk("%d,%d %s %llu / %llu [%s]", TP_printk("%d,%d %s %llu / %llu [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
__entry->sector, __entry->new_sector, __entry->comm) (unsigned long long)__entry->sector,
(unsigned long long)__entry->new_sector,
__entry->comm)
); );
TRACE_EVENT(block_remap, TRACE_EVENT(block_remap,
...@@ -471,9 +485,10 @@ TRACE_EVENT(block_remap, ...@@ -471,9 +485,10 @@ TRACE_EVENT(block_remap,
TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu", TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs, MAJOR(__entry->dev), MINOR(__entry->dev), __entry->rwbs,
__entry->sector, __entry->nr_sector, (unsigned long long)__entry->sector,
__entry->nr_sector,
MAJOR(__entry->old_dev), MINOR(__entry->old_dev), MAJOR(__entry->old_dev), MINOR(__entry->old_dev),
__entry->old_sector) (unsigned long long)__entry->old_sector)
); );
#endif /* _TRACE_BLOCK_H */ #endif /* _TRACE_BLOCK_H */
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或