From: Steven Rostedt <srostedt@redhat.com>
Date: Thu, 5 Mar 2009 01:31:11 +0000 (-0500)
Subject: tracing: fix seq read from trace files
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e74da5235cec6cb71eb338c987f876ecc793138b;p=linux-2.6-omap-h63xx.git

tracing: fix seq read from trace files

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>
---

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 57155dc5353..2e53e6f0944 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;
 }