public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Li Zefan <lizf@cn.fujitsu.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@elte.hu>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 3/5] trace_stat: don't increment @pos in stat_seq_start()
Date: Fri, 19 Jun 2009 14:46:56 +0800	[thread overview]
Message-ID: <4A3B3460.5090303@cn.fujitsu.com> (raw)
In-Reply-To: <4A3B3372.4040608@cn.fujitsu.com>

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 large than PAGE_SIZE.

[ Impact: fix missing entries when reading a stat file ]

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
 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;
 }
 
-- 
1.5.4.rc3





  parent reply	other threads:[~2009-06-19  6:45 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-19  6:42 [PATCH 0/5] tracing: seqfile fixes Li Zefan
2009-06-19  6:45 ` [PATCH 1/5] tracing/events: don't increment @pos in s_start() Li Zefan
2009-06-19  6:46 ` [PATCH 2/5] tracing_bprintk: don't increment @pos in t_start() Li Zefan
2009-06-19  9:39   ` Wang Liming
2009-06-22  0:38     ` Li Zefan
2009-06-22  2:08       ` Wang Liming
2009-06-22  3:01         ` Li Zefan
2009-06-19  6:46 ` Li Zefan [this message]
2009-06-19  6:47 ` [PATCH 4/5] ftrace: don't increment @pos in g_start() Li Zefan
2009-06-19  8:59   ` [PATCH] " Liming Wang
2009-06-19  9:45     ` Li Zefan
2009-06-22  0:45       ` Li Zefan
2009-06-22  2:42         ` Wang Liming
2009-06-22  3:15           ` Li Zefan
2009-06-22  3:08             ` Wang Liming
2009-06-19  6:48 ` [PATCH 5/5] tracing: reset iterator in t_start() Li Zefan
2009-06-23  6:48   ` Wang Liming
2009-06-23  7:19     ` Li Zefan
2009-06-23  7:19       ` Wang Liming

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=4A3B3460.5090303@cn.fujitsu.com \
    --to=lizf@cn.fujitsu.com \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=rostedt@goodmis.org \
    /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