From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753557AbYI3QOB (ORCPT ); Tue, 30 Sep 2008 12:14:01 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753079AbYI3QNx (ORCPT ); Tue, 30 Sep 2008 12:13:53 -0400 Received: from ey-out-2122.google.com ([74.125.78.26]:42817 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752900AbYI3QNx (ORCPT ); Tue, 30 Sep 2008 12:13:53 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=YcNVrRnoWb/0po2tbeRfIb92TyCN3Y+Clu5F5mDA8xC9wesHHDc/9r4cNSbxSrNMG/ plAFSDe2h/tC4BE8X+lp/4uPvAcWktKrucRKTM7MTutH2MeBzgjFH59BOhnhb6x3pk+s nkAPPWnWj0ZKaWCMGdvNg33ZQ7ExH4g2pBR2g= Message-ID: <48E25039.8080907@gmail.com> Date: Tue, 30 Sep 2008 18:13:45 +0200 From: Frederic Weisbecker User-Agent: Thunderbird 2.0.0.16 (X11/20080724) MIME-Version: 1.0 To: Ingo Molnar CC: Steven Rostedt , Pekka Paalanen , linux-kernel@vger.kernel.org Subject: Re: [PATCH V2 -tip 3/4] Tracing/ftrace: Adapt mmiotrace to the new type of print_line References: <48E11E1E.7010001@gmail.com> <20080929221934.260306dd@daedalus.pq.iki.fi> <20080930085241.GB10374@elte.hu> <20080930153912.GB22693@elte.hu> In-Reply-To: <20080930153912.GB22693@elte.hu> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ingo Molnar wrote: > * Frédéric Weisbecker wrote: > >> 2008/9/30 Steven Rostedt : >>> OK, I'll nuke the ring_buffer_lock :-/ >>> >>> The trace_pipe calls that and then calls print_trace_line which will >>> eventually lock the buffer again. This is a bug on my part. I'll fix that >>> today. >>> >>> Thanks, >> Strange, I can't see any case where print_trace_line could call the >> ring_buffer_lock. >> Hmm, I will see in your patch. >> >> Ingo, I just saw one damage from the merging, trace_empty() returns >> TRACE_TYPE_HANDLED. The type is wrong, it should return 1. It's not >> urgent since the value is the same. Should I send a patch for such a >> small error? > > yes, please do. One too many patch is far better than one too few ;-) > > Ingo > :) Here it is! Subject: [PATCH -tip] Tracing/ftrace: correct return value of trace_empty Correct the value's type of trace_empty function Signed-off-by: Frederic Weisbecker --- diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 6a1c76b..da3789d 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1686,7 +1686,7 @@ static int trace_empty(struct trace_iterator *iter) if (!ring_buffer_iter_empty(iter->buffer_iter[cpu])) return 0; } - return TRACE_TYPE_HANDLED; + return 1; } static enum print_line_t print_trace_line(struct trace_iterator *iter) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 6a1c76b..da3789d 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1686,7 +1686,7 @@ static int trace_empty(struct trace_iterator *iter) if (!ring_buffer_iter_empty(iter->buffer_iter[cpu])) return 0; } - return TRACE_TYPE_HANDLED; + return 1; } static enum print_line_t print_trace_line(struct trace_iterator *iter)