Commit 5aec598c authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Jens Axboe

blktrace: fix endianness for blk_log_remap()

The function blk_log_remap() can be simplified by removing the
call to get_pdu_remap() that copies the values into extra variable to
print the data, which also fixes the endiannness warning reported by
sparse.
Signed-off-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 71df3fd8
...@@ -1260,17 +1260,6 @@ static __u64 get_pdu_int(const struct trace_entry *ent, bool has_cg) ...@@ -1260,17 +1260,6 @@ static __u64 get_pdu_int(const struct trace_entry *ent, bool has_cg)
return be64_to_cpu(*val); return be64_to_cpu(*val);
} }
static void get_pdu_remap(const struct trace_entry *ent,
struct blk_io_trace_remap *r, bool has_cg)
{
const struct blk_io_trace_remap *__r = pdu_start(ent, has_cg);
__u64 sector_from = __r->sector_from;
r->device_from = be32_to_cpu(__r->device_from);
r->device_to = be32_to_cpu(__r->device_to);
r->sector_from = be64_to_cpu(sector_from);
}
typedef void (blk_log_action_t) (struct trace_iterator *iter, const char *act, typedef void (blk_log_action_t) (struct trace_iterator *iter, const char *act,
bool has_cg); bool has_cg);
...@@ -1410,13 +1399,13 @@ static void blk_log_with_error(struct trace_seq *s, ...@@ -1410,13 +1399,13 @@ static void blk_log_with_error(struct trace_seq *s,
static void blk_log_remap(struct trace_seq *s, const struct trace_entry *ent, bool has_cg) static void blk_log_remap(struct trace_seq *s, const struct trace_entry *ent, bool has_cg)
{ {
struct blk_io_trace_remap r = { .device_from = 0, }; const struct blk_io_trace_remap *__r = pdu_start(ent, has_cg);
get_pdu_remap(ent, &r, has_cg);
trace_seq_printf(s, "%llu + %u <- (%d,%d) %llu\n", trace_seq_printf(s, "%llu + %u <- (%d,%d) %llu\n",
t_sector(ent), t_sec(ent), t_sector(ent), t_sec(ent),
MAJOR(r.device_from), MINOR(r.device_from), MAJOR(be32_to_cpu(__r->device_from)),
(unsigned long long)r.sector_from); MINOR(be32_to_cpu(__r->device_from)),
be64_to_cpu(__r->sector_from));
} }
static void blk_log_plug(struct trace_seq *s, const struct trace_entry *ent, bool has_cg) static void blk_log_plug(struct trace_seq *s, const struct trace_entry *ent, bool has_cg)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment