aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>2011-01-07 08:53:58 +0100
committerJens Axboe <jaxboe@fusionio.com>2011-01-07 08:53:58 +0100
commit23036f1a340beec19cc451ba9719526c4ffb3a57 (patch)
tree958778a5a4491205df2e757c874b049375bcf273
parent329a67815b596d23daf0caa588ae0800e925320f (diff)
downloadkernel_samsung_smdk4412-23036f1a340beec19cc451ba9719526c4ffb3a57.tar.gz
kernel_samsung_smdk4412-23036f1a340beec19cc451ba9719526c4ffb3a57.tar.bz2
kernel_samsung_smdk4412-23036f1a340beec19cc451ba9719526c4ffb3a57.zip
blktrace: add missing probe argument to block_bio_complete
blktrace.c block bio complete callback needs to gain a new argument to reflect the newly added "error" tracepoint argument. This is needed to match the new block_bio_complete TRACE_EVENT as of commit de983a7bfcb7c020901ca6e2314cf55a4207ab5a. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> CC: Jeff Moyer <jmoyer@redhat.com> CC: Steven Rostedt <rostedt@goodmis.org> CC: Frederic Weisbecker <fweisbec@gmail.com> CC: Ingo Molnar <mingo@elte.hu> CC: Thomas Gleixner <tglx@linutronix.de> CC: Li Zefan <lizf@cn.fujitsu.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r--kernel/trace/blktrace.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 2b8e2ee7c0e..fab31aff9d9 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -782,7 +782,8 @@ static void blk_add_trace_bio_bounce(void *ignore,
}
static void blk_add_trace_bio_complete(void *ignore,
- struct request_queue *q, struct bio *bio)
+ struct request_queue *q, struct bio *bio,
+ int error)
{
blk_add_trace_bio(q, bio, BLK_TA_COMPLETE);
}