diff options
| author | Tejun Heo <tj@kernel.org> | 2013-01-11 22:06:34 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-01-14 15:00:36 +0100 |
| commit | 8c1cf6bb02fda79b0a4b9bd121f6be6d4ce7a15a (patch) | |
| tree | e10008c7fb3c7b8cf832712dd6e7b55f149a49e6 /kernel/trace | |
| parent | block: add missing block_bio_complete() tracepoint (diff) | |
| download | linux-8c1cf6bb02fda79b0a4b9bd121f6be6d4ce7a15a.tar.xz linux-8c1cf6bb02fda79b0a4b9bd121f6be6d4ce7a15a.zip | |
block: add @req to bio_{front|back}_merge tracepoints
bio_{front|back}_merge tracepoints report a bio merging into an
existing request but didn't specify which request the bio is being
merged into. Add @req to it. This makes it impossible to share the
event template with block_bio_queue - split it out.
@req isn't used or exported to userland at this point and there is no
userland visible behavior change. Later changes will make use of the
extra parameter.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/blktrace.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 190d98fbed27..fb593f6a687e 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -803,6 +803,7 @@ static void blk_add_trace_bio_complete(void *ignore, struct bio *bio, int error) static void blk_add_trace_bio_backmerge(void *ignore, struct request_queue *q, + struct request *rq, struct bio *bio) { blk_add_trace_bio(q, bio, BLK_TA_BACKMERGE, 0); @@ -810,6 +811,7 @@ static void blk_add_trace_bio_backmerge(void *ignore, static void blk_add_trace_bio_frontmerge(void *ignore, struct request_queue *q, + struct request *rq, struct bio *bio) { blk_add_trace_bio(q, bio, BLK_TA_FRONTMERGE, 0); |