From patchwork Tue May 10 00:22:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaohua Li X-Patchwork-Id: 9052631 Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B14A99F30C for ; Tue, 10 May 2016 00:22:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D57FE2010E for ; Tue, 10 May 2016 00:22:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB07F200FE for ; Tue, 10 May 2016 00:22:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753231AbcEJAWU (ORCPT ); Mon, 9 May 2016 20:22:20 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:21499 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753580AbcEJAWT (ORCPT ); Mon, 9 May 2016 20:22:19 -0400 Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.16.0.11/8.16.0.11) with SMTP id u4A0Losu022569 for ; Mon, 9 May 2016 17:22:18 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=facebook; bh=NRI6kcQdsj4LyFI1H+4ARKo1OeD6mc55nBOsy1QIxEQ=; b=O/+d+TaNYkYlxju0HPxoFHujP4zH5lfxJhEll6AoFVKSEbM6x9CZBA06seem3C9G5WGp ioFhL4aU8MmYJGj685kdAhiYNT2gXq23DeoPce+bHc0RuglrVDX2Sb4Y9RgjIXoSNbwe YnMaWA7mceCMFoPDoK4FR7d6BeNLq9ZR6/8= Received: from mail.thefacebook.com ([199.201.64.23]) by m0001303.ppops.net with ESMTP id 22u4gm04dt-1 (version=TLSv1 cipher=AES128-SHA bits=128 verify=NOT) for ; Mon, 09 May 2016 17:22:18 -0700 Received: from mx-out.facebook.com (192.168.52.123) by PRN-CHUB07.TheFacebook.com (192.168.16.17) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 9 May 2016 17:22:17 -0700 Received: from facebook.com (2401:db00:11:d0a2:face:0:39:0) by mx-out.facebook.com (10.212.236.87) with ESMTP id 401623b6164511e6b9f90002c9521c9e-7b5f7c50 for ; Mon, 09 May 2016 17:22:16 -0700 Received: by devbig084.prn1.facebook.com (Postfix, from userid 11222) id B031B49C095E; Mon, 9 May 2016 17:22:15 -0700 (PDT) From: Shaohua Li To: , CC: Steven Rostedt , , Subject: [PATCH 1/3] blktrace: delete garbage for message trace Date: Mon, 9 May 2016 17:22:13 -0700 Message-ID: <2c3ee532132f8925dd0be1178e8dee0bba6b448c.1462838969.git.shli@fb.com> X-Mailer: git-send-email 2.8.0.rc2 X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-05-09_09:, , signatures=0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-8.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Jeff Moyer --- 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)))