Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
blktrace: move ftrace blk_io_tracer to blk_io_trace2
Move ftrace's blk_io_tracer 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
4d8bc7bd
67bfa74d
+8
-8
+8
-8
kernel/trace/blktrace.c
+8
-8
kernel/trace/blktrace.c
···
1224
1224
* struct blk_io_tracer formatting routines
1225
1225
*/
1226
1226
1227
-
static void fill_rwbs(char *rwbs, const struct blk_io_trace *t)
1227
+
static void fill_rwbs(char *rwbs, const struct blk_io_trace2 *t)
1228
1228
{
1229
1229
int i = 0;
1230
1230
int tc = t->action >> BLK_TC_SHIFT;
···
1259
1259
}
1260
1260
1261
1261
static inline
1262
-
const struct blk_io_trace *te_blk_io_trace(const struct trace_entry *ent)
1262
+
const struct blk_io_trace2 *te_blk_io_trace(const struct trace_entry *ent)
1263
1263
{
1264
-
return (const struct blk_io_trace *)ent;
1264
+
return (const struct blk_io_trace2 *)ent;
1265
1265
}
1266
1266
1267
1267
static inline const void *pdu_start(const struct trace_entry *ent, bool has_cg)
···
1320
1320
unsigned long long ts = iter->ts;
1321
1321
unsigned long nsec_rem = do_div(ts, NSEC_PER_SEC);
1322
1322
unsigned secs = (unsigned long)ts;
1323
-
const struct blk_io_trace *t = te_blk_io_trace(iter->ent);
1323
+
const struct blk_io_trace2 *t = te_blk_io_trace(iter->ent);
1324
1324
1325
1325
fill_rwbs(rwbs, t);
1326
1326
···
1334
1334
bool has_cg)
1335
1335
{
1336
1336
char rwbs[RWBS_LEN];
1337
-
const struct blk_io_trace *t = te_blk_io_trace(iter->ent);
1337
+
const struct blk_io_trace2 *t = te_blk_io_trace(iter->ent);
1338
1338
1339
1339
fill_rwbs(rwbs, t);
1340
1340
if (has_cg) {
···
1555
1555
{
1556
1556
struct trace_array *tr = iter->tr;
1557
1557
struct trace_seq *s = &iter->seq;
1558
-
const struct blk_io_trace *t;
1558
+
const struct blk_io_trace2 *t;
1559
1559
u16 what;
1560
1560
bool long_act;
1561
1561
blk_log_action_t *log_action;
···
1592
1592
static void blk_trace_synthesize_old_trace(struct trace_iterator *iter)
1593
1593
{
1594
1594
struct trace_seq *s = &iter->seq;
1595
-
struct blk_io_trace *t = (struct blk_io_trace *)iter->ent;
1596
-
const int offset = offsetof(struct blk_io_trace, sector);
1595
+
struct blk_io_trace2 *t = (struct blk_io_trace2 *)iter->ent;
1596
+
const int offset = offsetof(struct blk_io_trace2, sector);
1597
1597
struct blk_io_trace old = {
1598
1598
.magic = BLK_IO_TRACE_MAGIC | BLK_IO_TRACE_VERSION,
1599
1599
.time = iter->ts,