| Message ID | 2c3ee532132f8925dd0be1178e8dee0bba6b448c.1462838969.git.shli@fb.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Shaohua Li <shli@fb.com> writes: > 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> > --- > 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))) It would have been closer to the original to put the 'out' label back in, but this is fine. Reviewed-by: Jeff Moyer <jmoyer@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe linux-block" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 05/09/2016 06:22 PM, Shaohua Li wrote: > 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. Applied this, and 2+3/3. Thanks Shaohua.
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)))
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> --- kernel/trace/blktrace.c | 1 + 1 file changed, 1 insertion(+)