Skip to content

Commit

Permalink
blktrace: delete garbage for message trace
Browse files Browse the repository at this point in the history
commit f4a1d08 introduces a regression. Originally for
BLK_TN_MESSAGE, we add message in trace and return. The commit ignores
the early return and add garbage info.

Signed-off-by: Shaohua Li <shli@fb.com>
Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
  • Loading branch information
Shaohua Li authored and Jens Axboe committed May 10, 2016
1 parent 0ef5a50 commit b7d7641
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions kernel/trace/blktrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -1349,6 +1349,7 @@ static enum print_line_t print_one_line(struct trace_iterator *iter,
if (t->action == BLK_TN_MESSAGE) {
log_action(iter, long_act ? "message" : "m");
blk_log_msg(s, iter->ent);
return trace_handle_return(s);
}

if (unlikely(what == 0 || what >= ARRAY_SIZE(what2act)))
Expand Down

0 comments on commit b7d7641

Please sign in to comment.