From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752811AbcEJOb3 (ORCPT ); Tue, 10 May 2016 10:31:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42028 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751587AbcEJOb2 (ORCPT ); Tue, 10 May 2016 10:31:28 -0400 From: Jeff Moyer To: Shaohua Li Cc: , , Steven Rostedt , , Subject: Re: [PATCH 1/3] blktrace: delete garbage for message trace References: <2c3ee532132f8925dd0be1178e8dee0bba6b448c.1462838969.git.shli@fb.com> X-PGP-KeyID: 1F78E1B4 X-PGP-CertKey: F6FE 280D 8293 F72C 65FD 5A58 1FF8 A7CA 1F78 E1B4 X-PCLoadLetter: What the f**k does that mean? Date: Tue, 10 May 2016 10:31:25 -0400 In-Reply-To: <2c3ee532132f8925dd0be1178e8dee0bba6b448c.1462838969.git.shli@fb.com> (Shaohua Li's message of "Mon, 9 May 2016 17:22:13 -0700") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 10 May 2016 14:31:27 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Shaohua Li 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 > --- > 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