blktrace: Report pid with note messages

Currently informational messages within block trace do not have PID
information of the process reporting the message included. With BFQ it
is sometimes useful to have the information and there's no good reason
to omit the information from the trace. So just fill in pid information
when generating note message.

Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Acked-by: Paolo Valente <paolo.valente@linaro.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index ca39dc3230cb3a9e075735ac331968cbac879caf..ea47f20840870a9e41a0e85319bbc6b8c2a09c2d 100644 (file)
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -170,10 +170,10 @@ void __trace_note_message(struct blk_trace *bt, struct blkcg *blkcg,
        if (!(blk_tracer_flags.val & TRACE_BLK_OPT_CGROUP))
                blkcg = NULL;
 #ifdef CONFIG_BLK_CGROUP
-       trace_note(bt, 0, BLK_TN_MESSAGE, buf, n,
+       trace_note(bt, current->pid, BLK_TN_MESSAGE, buf, n,
                   blkcg ? cgroup_id(blkcg->css.cgroup) : 1);
 #else
-       trace_note(bt, 0, BLK_TN_MESSAGE, buf, n, 0);
+       trace_note(bt, current->pid, BLK_TN_MESSAGE, buf, n, 0);
 #endif
        local_irq_restore(flags);
 }