diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2009-02-02 17:30:12 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-03 08:03:52 -0500 |
commit | 2c9b238eb325895d3312dad64e2685783575e474 (patch) | |
tree | 1c64910c6084c53b9d9a458a34568ccb083419e8 /block | |
parent | c4a8e8be2d43cc22b371e8e9c05c253409759d94 (diff) |
trace: Change struct trace_event callbacks parameter list
Impact: API change
The trace_seq and trace_entry are in trace_iterator, where there are
more fields that may be needed by tracers, so just pass the
tracer_iterator as is already the case for struct tracer->print_line.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'block')
-rw-r--r-- | block/blktrace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/block/blktrace.c b/block/blktrace.c index 3f25425ade12..570cd3c40bd1 100644 --- a/block/blktrace.c +++ b/block/blktrace.c | |||
@@ -1140,10 +1140,10 @@ static struct { | |||
1140 | [__BLK_TA_REMAP] = {{ "A", "remap" }, blk_log_remap }, | 1140 | [__BLK_TA_REMAP] = {{ "A", "remap" }, blk_log_remap }, |
1141 | }; | 1141 | }; |
1142 | 1142 | ||
1143 | static int blk_trace_event_print(struct trace_seq *s, struct trace_entry *ent, | 1143 | static int blk_trace_event_print(struct trace_iterator *iter, int flags) |
1144 | int flags) | ||
1145 | { | 1144 | { |
1146 | const struct blk_io_trace *t = (struct blk_io_trace *)ent; | 1145 | struct trace_seq *s = &iter->seq; |
1146 | const struct blk_io_trace *t = (struct blk_io_trace *)iter->ent; | ||
1147 | const u16 what = t->action & ((1 << BLK_TC_SHIFT) - 1); | 1147 | const u16 what = t->action & ((1 << BLK_TC_SHIFT) - 1); |
1148 | int ret; | 1148 | int ret; |
1149 | 1149 | ||
@@ -1153,7 +1153,7 @@ static int blk_trace_event_print(struct trace_seq *s, struct trace_entry *ent, | |||
1153 | const bool long_act = !!(trace_flags & TRACE_ITER_VERBOSE); | 1153 | const bool long_act = !!(trace_flags & TRACE_ITER_VERBOSE); |
1154 | ret = blk_log_action_seq(s, t, what2act[what].act[long_act]); | 1154 | ret = blk_log_action_seq(s, t, what2act[what].act[long_act]); |
1155 | if (ret) | 1155 | if (ret) |
1156 | ret = what2act[what].print(s, ent); | 1156 | ret = what2act[what].print(s, iter->ent); |
1157 | } | 1157 | } |
1158 | 1158 | ||
1159 | return ret ? TRACE_TYPE_HANDLED : TRACE_TYPE_PARTIAL_LINE; | 1159 | return ret ? TRACE_TYPE_HANDLED : TRACE_TYPE_PARTIAL_LINE; |