blktrace: move trace_note to blk_io_trace2

Move trace_note() to the new blk_io_trace2 infrastructure.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 5f8ecf88a19612bf8105aa066d9d13e5226dc32c..08c7be671c473ef011ec6d9ce32a83865eb2e6d9 100644 (file)
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -173,18 +173,18 @@ static void relay_blktrace_event(struct blk_trace *bt, unsigned long sequence,
 static void trace_note(struct blk_trace *bt, pid_t pid, u64 action,
                       const void *data, size_t len, u64 cgid)
 {
-       struct blk_io_trace *t;
        struct ring_buffer_event *event = NULL;
        struct trace_buffer *buffer = NULL;
        unsigned int trace_ctx = 0;
        int cpu = smp_processor_id();
        bool blk_tracer = blk_tracer_enabled;
        ssize_t cgid_len = cgid ? sizeof(cgid) : 0;
-       size_t trace_len;
 
-       trace_len = sizeof(*t) + cgid_len + len;
        action = lower_32_bits(action | (cgid ? __BLK_TN_CGROUP : 0));
        if (blk_tracer) {
+               struct blk_io_trace2 *t;
+               size_t trace_len = sizeof(*t) + cgid_len + len;
+
                buffer = blk_tr->array_buffer.buffer;
                trace_ctx = tracing_gen_ctx_flags(0);
                event = trace_buffer_lock_reserve(buffer, TRACE_BLK,
@@ -192,9 +192,9 @@ static void trace_note(struct blk_trace *bt, pid_t pid, u64 action,
                if (!event)
                        return;
                t = ring_buffer_event_data(event);
-               record_blktrace_event(t, pid, cpu, 0, 0,
-                                     action, bt->dev, 0, cgid, cgid_len,
-                                     (void *)data, len);
+               record_blktrace_event2(t, pid, cpu, 0, 0,
+                                      action, bt->dev, 0, cgid, cgid_len,
+                                      (void *)data, len);
                trace_buffer_unlock_commit(blk_tr, buffer, event, trace_ctx);
                return;
        }
@@ -359,7 +359,7 @@ static void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,
 
                buffer = blk_tr->array_buffer.buffer;
                trace_ctx = tracing_gen_ctx_flags(0);
-               trace_len = sizeof(struct blk_io_trace) + pdu_len + cgid_len;
+               trace_len = sizeof(struct blk_io_trace2) + pdu_len + cgid_len;
                event = trace_buffer_lock_reserve(buffer, TRACE_BLK,
                                                  trace_len, trace_ctx);
                if (!event)