public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Li Zefan <lizf@cn.fujitsu.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
	lizf@cn.fujitsu.com, fweisbec@gmail.com, rostedt@goodmis.org,
	tglx@linutronix.de, liming.wang@windriver.com, mingo@elte.hu
Subject: [tip:tracing/urgent] trace_stat: Don't increment @pos in seq start()
Date: Wed, 24 Jun 2009 09:46:02 GMT	[thread overview]
Message-ID: <tip-2961bf345fd1b736c3db46cad0f69855f67fbe9c@git.kernel.org> (raw)
In-Reply-To: <4A418716.90209@cn.fujitsu.com>

Commit-ID:  2961bf345fd1b736c3db46cad0f69855f67fbe9c
Gitweb:     http://git.kernel.org/tip/2961bf345fd1b736c3db46cad0f69855f67fbe9c
Author:     Li Zefan <lizf@cn.fujitsu.com>
AuthorDate: Wed, 24 Jun 2009 09:53:26 +0800
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Wed, 24 Jun 2009 11:02:51 +0200

trace_stat: Don't increment @pos in seq start()

It's wrong to increment @pos in stat_seq_start(). It causes some
stat entries lost when reading stat file, if the output of the file
is larger than PAGE_SIZE.

Reviewed-by: Liming Wang <liming.wang@windriver.com>
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <4A418716.90209@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>


---
 kernel/trace/trace_stat.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/kernel/trace/trace_stat.c b/kernel/trace/trace_stat.c
index c006437..e66f5e4 100644
--- a/kernel/trace/trace_stat.c
+++ b/kernel/trace/trace_stat.c
@@ -199,17 +199,13 @@ static void *stat_seq_start(struct seq_file *s, loff_t *pos)
 	mutex_lock(&session->stat_mutex);
 
 	/* If we are in the beginning of the file, print the headers */
-	if (!*pos && session->ts->stat_headers) {
-		(*pos)++;
+	if (!*pos && session->ts->stat_headers)
 		return SEQ_START_TOKEN;
-	}
 
 	node = rb_first(&session->stat_root);
 	for (i = 0; node && i < *pos; i++)
 		node = rb_next(node);
 
-	(*pos)++;
-
 	return node;
 }
 

  reply	other threads:[~2009-06-24  9:46 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-24  1:52 [PATCH 0/7] tracing: seqfile fixes, take 2 Li Zefan
2009-06-24  1:52 ` [PATCH 1/7] tracing/events: don't increment @pos in s_start() Li Zefan
2009-06-24  9:45   ` [tip:tracing/urgent] tracing/events: Don't " tip-bot for Li Zefan
2009-06-24  1:52 ` [PATCH 2/7] tracing_bprintk: don't increment @pos in t_start() Li Zefan
2009-06-24  9:45   ` [tip:tracing/urgent] tracing_bprintk: Don't " tip-bot for Li Zefan
2009-06-24  1:53 ` [PATCH 3/7] trace_stat: don't increment @pos in seq start() Li Zefan
2009-06-24  9:46   ` tip-bot for Li Zefan [this message]
2009-06-24  1:53 ` [PATCH 4/7] tracing: reset iterator in t_start() Li Zefan
2009-06-24  9:46   ` [tip:tracing/urgent] tracing: Reset " tip-bot for Li Zefan
2009-06-24  1:54 ` [PATCH 5/7] ftrace: don't increment @pos in g_start() Li Zefan
2009-06-24  9:46   ` [tip:tracing/urgent] ftrace: Don't " tip-bot for Li Zefan
2009-06-24  1:54 ` [PATCH 6/7] ftrace: don't manipulate @pos in t_start() Li Zefan
2009-06-24  9:46   ` [tip:tracing/urgent] ftrace: Don't " tip-bot for Li Zefan
2009-06-24  1:54 ` [PATCH 7/7] ftrace: fix t_hash_start() Li Zefan
2009-06-24  9:46   ` [tip:tracing/urgent] ftrace: Fix t_hash_start() tip-bot for Li Zefan
2009-06-24  9:03 ` [PATCH 0/7] tracing: seqfile fixes, take 2 Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-2961bf345fd1b736c3db46cad0f69855f67fbe9c@git.kernel.org \
    --to=lizf@cn.fujitsu.com \
    --cc=fweisbec@gmail.com \
    --cc=hpa@zytor.com \
    --cc=liming.wang@windriver.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@redhat.com \
    --cc=rostedt@goodmis.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox