diff options
| author | Tejun Heo <tj@kernel.org> | 2013-01-11 13:06:34 -0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-01-14 15:00:36 +0100 |
| commit | 8c1cf6bb02fda79b0a4b9bd121f6be6d4ce7a15a (patch) | |
| tree | e10008c7fb3c7b8cf832712dd6e7b55f149a49e6 /block/blk-core.c | |
| parent | 3a366e614d0837d9fc23f78cdb1a1186ebc3387f (diff) | |
| download | lwn-8c1cf6bb02fda79b0a4b9bd121f6be6d4ce7a15a.tar.gz lwn-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 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 4f5aec708be6..66d31687cf6b 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1347,7 +1347,7 @@ static bool bio_attempt_back_merge(struct request_queue *q, struct request *req, if (!ll_back_merge_fn(q, req, bio)) return false; - trace_block_bio_backmerge(q, bio); + trace_block_bio_backmerge(q, req, bio); if ((req->cmd_flags & REQ_FAILFAST_MASK) != ff) blk_rq_set_mixed_merge(req); @@ -1369,7 +1369,7 @@ static bool bio_attempt_front_merge(struct request_queue *q, if (!ll_front_merge_fn(q, req, bio)) return false; - trace_block_bio_frontmerge(q, bio); + trace_block_bio_frontmerge(q, req, bio); if ((req->cmd_flags & REQ_FAILFAST_MASK) != ff) blk_rq_set_mixed_merge(req); |