Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 146221
b: refs/heads/master
c: 6556d1d
h: refs/heads/master
i:
  146219: f76f489
v: v3
  • Loading branch information
Steven Rostedt authored and Steven Rostedt committed Jun 9, 2009
1 parent 3b1dfd8 commit 054ce9e
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 55782138e47d9baf2f7d3a7af9e7cf42adf72c56
refs/heads/master: 6556d1df88fe68f9836beeb43342a336691cb67c
45 changes: 30 additions & 15 deletions trunk/include/trace/events/block.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ TRACE_EVENT(block_rq_abort,
TP_printk("%d,%d %s (%s) %llu + %u [%d]",
MAJOR(__entry->dev), MINOR(__entry->dev),
__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,
Expand Down Expand Up @@ -71,7 +72,8 @@ TRACE_EVENT(block_rq_insert,
TP_printk("%d,%d %s %u (%s) %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev),
__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,
Expand Down Expand Up @@ -105,7 +107,8 @@ TRACE_EVENT(block_rq_issue,
TP_printk("%d,%d %s %u (%s) %llu + %u [%s]",
MAJOR(__entry->dev), MINOR(__entry->dev),
__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,
Expand Down Expand Up @@ -137,7 +140,8 @@ TRACE_EVENT(block_rq_requeue,
TP_printk("%d,%d %s (%s) %llu + %u [%d]",
MAJOR(__entry->dev), MINOR(__entry->dev),
__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,
Expand Down Expand Up @@ -169,7 +173,8 @@ TRACE_EVENT(block_rq_complete,
TP_printk("%d,%d %s (%s) %llu + %u [%d]",
MAJOR(__entry->dev), MINOR(__entry->dev),
__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,

Expand All @@ -195,7 +200,8 @@ TRACE_EVENT(block_bio_bounce,

TP_printk("%d,%d %s %llu + %u [%s]",
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,
Expand All @@ -221,7 +227,8 @@ TRACE_EVENT(block_bio_complete,

TP_printk("%d,%d %s %llu + %u [%d]",
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,
Expand All @@ -248,7 +255,8 @@ TRACE_EVENT(block_bio_backmerge,

TP_printk("%d,%d %s %llu + %u [%s]",
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,
Expand All @@ -275,7 +283,8 @@ TRACE_EVENT(block_bio_frontmerge,

TP_printk("%d,%d %s %llu + %u [%s]",
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,
Expand All @@ -302,7 +311,8 @@ TRACE_EVENT(block_bio_queue,

TP_printk("%d,%d %s %llu + %u [%s]",
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,
Expand Down Expand Up @@ -330,7 +340,8 @@ TRACE_EVENT(block_getrq,

TP_printk("%d,%d %s %llu + %u [%s]",
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,
Expand Down Expand Up @@ -358,7 +369,8 @@ TRACE_EVENT(block_sleeprq,

TP_printk("%d,%d %s %llu + %u [%s]",
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,
Expand Down Expand Up @@ -441,7 +453,9 @@ TRACE_EVENT(block_split,

TP_printk("%d,%d %s %llu / %llu [%s]",
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,
Expand Down Expand Up @@ -471,9 +485,10 @@ TRACE_EVENT(block_remap,

TP_printk("%d,%d %s %llu + %u <- (%d,%d) %llu",
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),
__entry->old_sector)
(unsigned long long)__entry->old_sector)
);

#endif /* _TRACE_BLOCK_H */
Expand Down

0 comments on commit 054ce9e

Please sign in to comment.