]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit - block/blk-core.c
block: add @req to bio_{front|back}_merge tracepoints
authorTejun Heo <tj@kernel.org>
Fri, 11 Jan 2013 21:06:34 +0000 (13:06 -0800)
committerJens Axboe <axboe@kernel.dk>
Mon, 14 Jan 2013 14:00:36 +0000 (15:00 +0100)
commit8c1cf6bb02fda79b0a4b9bd121f6be6d4ce7a15a
treee10008c7fb3c7b8cf832712dd6e7b55f149a49e6
parent3a366e614d0837d9fc23f78cdb1a1186ebc3387f
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>
block/blk-core.c
include/trace/events/block.h
kernel/trace/blktrace.c