summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2009-02-02 20:30:12 -0200
committerIngo Molnar <mingo@elte.hu>2009-02-03 14:03:52 +0100
commit2c9b238eb325895d3312dad64e2685783575e474 (patch)
tree1c64910c6084c53b9d9a458a34568ccb083419e8 /block
parentc4a8e8be2d43cc22b371e8e9c05c253409759d94 (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.c8
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 {
[__BLK_TA_REMAP] = {{ "A", "remap" }, blk_log_remap },
};
-static int blk_trace_event_print(struct trace_seq *s, struct trace_entry *ent,
- int flags)
+static int blk_trace_event_print(struct trace_iterator *iter, int flags)
{
- const struct blk_io_trace *t = (struct blk_io_trace *)ent;
+ struct trace_seq *s = &iter->seq;
+ const struct blk_io_trace *t = (struct blk_io_trace *)iter->ent;
const u16 what = t->action & ((1 << BLK_TC_SHIFT) - 1);
int ret;
@@ -1153,7 +1153,7 @@ static int blk_trace_event_print(struct trace_seq *s, struct trace_entry *ent,
const bool long_act = !!(trace_flags & TRACE_ITER_VERBOSE);
ret = blk_log_action_seq(s, t, what2act[what].act[long_act]);
if (ret)
- ret = what2act[what].print(s, ent);
+ ret = what2act[what].print(s, iter->ent);
}
return ret ? TRACE_TYPE_HANDLED : TRACE_TYPE_PARTIAL_LINE;