diff options
| author | Shaohua Li <shli@fb.com> | 2016-05-09 17:22:13 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-05-10 08:41:34 -0600 |
| commit | b7d7641e2a8640a2f6ac7cdadd6c56eb12728b70 (patch) | |
| tree | 542028f74f076034cefcff357f1e9bcdce3dbe84 /kernel/trace | |
| parent | 0ef5a50c1658d4d96a44f145bcb92ff3310c75b1 (diff) | |
| download | linux-b7d7641e2a8640a2f6ac7cdadd6c56eb12728b70.tar.gz linux-b7d7641e2a8640a2f6ac7cdadd6c56eb12728b70.tar.bz2 linux-b7d7641e2a8640a2f6ac7cdadd6c56eb12728b70.zip | |
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 <shli@fb.com>
Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/blktrace.c | 1 |
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))) |