mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@elte.hu>,
	Andrew Morton <akpm@linux-foundation.org>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	"H. Peter Anvin" <hpa@zytor.com>, Theodore Tso <tytso@mit.edu>,
	Thomas Gleixner <tglx@linutronix.de>,
	Steven Rostedt <srostedt@redhat.com>
Subject: [PATCH 3/7] tracing: fix seq read from trace files
Date: Wed, 04 Mar 2009 22:25:35 -0500	[thread overview]
Message-ID: <20090305032712.999790054@goodmis.org> (raw)
In-Reply-To: <20090305032532.802709985@goodmis.org>

[-- Attachment #1: 0003-tracing-fix-seq-read-from-trace-files.patch --]
[-- Type: text/plain, Size: 851 bytes --]

From: Steven Rostedt <srostedt@redhat.com>

The buffer used by trace_seq was updated incorrectly. Instead
of consuming what was actually read, it consumed the rest of the
buffer on reads.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
---
 kernel/trace/trace.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 57155dc..2e53e6f 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -361,7 +361,7 @@ ssize_t trace_seq_to_user(struct trace_seq *s, char __user *ubuf, size_t cnt)
 
 	cnt -= ret;
 
-	s->readpos += len;
+	s->readpos += cnt;
 	return cnt;
 }
 
@@ -380,7 +380,7 @@ ssize_t trace_seq_to_buffer(struct trace_seq *s, void *buf, size_t cnt)
 	if (!ret)
 		return -EFAULT;
 
-	s->readpos += len;
+	s->readpos += cnt;
 	return cnt;
 }
 
-- 
1.6.1.3

-- 

  parent reply	other threads:[~2009-03-05  3:28 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-05  3:25 [PATCH 0/7] [GIT PULL] for tip/tracing/ftrace Steven Rostedt
2009-03-05  3:25 ` [PATCH 1/7] ring-buffer: fix timestamp in partial ring_buffer_page_read Steven Rostedt
2009-03-05  3:25 ` [PATCH 2/7] tracing: do not return EFAULT if read copied anything Steven Rostedt
2009-03-05  3:25 ` Steven Rostedt [this message]
2009-03-05  3:25 ` [PATCH 4/7] tracing: add latency output format option Steven Rostedt
2009-03-05  3:25 ` [PATCH 5/7] tracing: remove extra latency_trace method from trace structure Steven Rostedt
2009-03-05  3:25 ` [PATCH 6/7] tracing: consolidate print_lat_fmt and print_trace_fmt Steven Rostedt
2009-03-05  3:25 ` [PATCH 7/7] tracing: have latency tracers set the latency format Steven Rostedt
2009-03-05  9:22 ` [PATCH 0/7] [GIT PULL] for tip/tracing/ftrace 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=20090305032712.999790054@goodmis.org \
    --to=rostedt@goodmis.org \
    --cc=akpm@linux-foundation.org \
    --cc=fweisbec@gmail.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=srostedt@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=tytso@mit.edu \
    /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

Powered by JetHome