leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blktrace: delete garbage for message trace

Browse Source 
commit f4a1d08ce6 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>
This commit is contained in:
Shaohua Li 2016-05-09 17:22:13 -07:00 committed by Jens Axboe
parent 0ef5a50c16
commit b7d7641e2a
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/trace/blktrace.c
View File

@ -1349,6 +1349,7 @@ static enum print_line_t print_one_line(struct trace_iterator *iter,
if (t->action == BLK_TN_MESSAGE) { if (t->action == BLK_TN_MESSAGE) {
log_action(iter, long_act ? "message" : "m"); log_action(iter, long_act ? "message" : "m");
blk_log_msg(s, iter->ent); blk_log_msg(s, iter->ent);
return trace_handle_return(s);
} }
if (unlikely(what == 0 || what >= ARRAY_SIZE(what2act))) if (unlikely(what == 0 || what >= ARRAY_SIZE(what2act)))