Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Johannes Thumshirn
and committed by
Jens Axboe
67bfa74d
915bb538
+7
-7
+7
-7
kernel/trace/blktrace.c
+7
-7
kernel/trace/blktrace.c
···
173
173
static void trace_note(struct blk_trace *bt, pid_t pid, u64 action,
174
174
const void *data, size_t len, u64 cgid)
175
175
{
176
-
struct blk_io_trace *t;
177
176
struct ring_buffer_event *event = NULL;
178
177
struct trace_buffer *buffer = NULL;
179
178
unsigned int trace_ctx = 0;
180
179
int cpu = smp_processor_id();
181
180
bool blk_tracer = blk_tracer_enabled;
182
181
ssize_t cgid_len = cgid ? sizeof(cgid) : 0;
183
-
size_t trace_len;
184
182
185
-
trace_len = sizeof(*t) + cgid_len + len;
186
183
action = lower_32_bits(action | (cgid ? __BLK_TN_CGROUP : 0));
187
184
if (blk_tracer) {
185
+
struct blk_io_trace2 *t;
186
+
size_t trace_len = sizeof(*t) + cgid_len + len;
187
+
188
188
buffer = blk_tr->array_buffer.buffer;
189
189
trace_ctx = tracing_gen_ctx_flags(0);
190
190
event = trace_buffer_lock_reserve(buffer, TRACE_BLK,
···
192
192
if (!event)
193
193
return;
194
194
t = ring_buffer_event_data(event);
195
-
record_blktrace_event(t, pid, cpu, 0, 0,
196
-
action, bt->dev, 0, cgid, cgid_len,
197
-
(void *)data, len);
195
+
record_blktrace_event2(t, pid, cpu, 0, 0,
196
+
action, bt->dev, 0, cgid, cgid_len,
197
+
(void *)data, len);
198
198
trace_buffer_unlock_commit(blk_tr, buffer, event, trace_ctx);
199
199
return;
200
200
}
···
359
359
360
360
buffer = blk_tr->array_buffer.buffer;
361
361
trace_ctx = tracing_gen_ctx_flags(0);
362
-
trace_len = sizeof(struct blk_io_trace) + pdu_len + cgid_len;
362
+
trace_len = sizeof(struct blk_io_trace2) + pdu_len + cgid_len;
363
363
event = trace_buffer_lock_reserve(buffer, TRACE_BLK,
364
364
trace_len, trace_ctx);
365
365
if (!event)