Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1397602 > unrolled thread

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

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/3] blktrace: delete garbage for message trace Shaohua Li <shli@fb.com> - 2016-05-10 02:30 +0200
    Re: [PATCH 1/3] blktrace: delete garbage for message trace Jeff Moyer <jmoyer@redhat.com> - 2016-05-10 16:40 +0200
    Re: [PATCH 1/3] blktrace: delete garbage for message trace Jens Axboe <axboe@kernel.dk> - 2016-05-10 16:50 +0200

#1397602 — [PATCH 1/3] 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>
---
 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

[toc] | [next] | [standalone]

#1398156

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>

[toc] | [prev] | [next] | [standalone]

#1398163

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.

-- 
Jens Axboe

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web