[PATCH 1/3] blktrace: delete garbage for message trace

From: Shaohua Li
Date: Mon May 09 2016 - 20:22:45 EST


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 <shli@xxxxxx>
---
kernel/trace/blktrace.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index f94e7a2..8ae9ea2 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)))
--
2.8.0.rc2