aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaohua Li <[email protected]>2016-05-09 17:22:13 -0700
committerJens Axboe <[email protected]>2016-05-10 08:41:34 -0600
commitb7d7641e2a8640a2f6ac7cdadd6c56eb12728b70 (patch)
tree542028f74f076034cefcff357f1e9bcdce3dbe84
parent0ef5a50c1658d4d96a44f145bcb92ff3310c75b1 (diff)
blktrace: delete garbage for message trace
commit f4a1d08ce65 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 <[email protected]> Reviewed-by: Jeff Moyer <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
-rw-r--r--kernel/trace/blktrace.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index f94e7a21f52d..8ae9ea2cacaf 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -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)))