OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ftrace: restore iterator trace in pipe read 

The trace iterator is reset in the read. We still need to restore the tracer
that the trace_pipe was opened with.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Steven Rostedt 2008-05-12 21:20:58 +02:00 committed by Thomas Gleixner
parent 8487c23765
commit b5685aede3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/trace/trace.c
View File

@ -2202,6 +2202,8 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
{
struct trace_iterator *iter = filp->private_data;
struct trace_array_cpu *data;
struct trace_array *tr = iter->tr;
struct tracer *tracer = iter->trace;
static cpumask_t mask;
static int start;
unsigned long flags;
@ -2274,7 +2276,8 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
cnt = PAGE_SIZE - 1;
memset(iter, 0, sizeof(*iter));
iter->tr = &global_trace;
iter->tr = tr;
iter->trace = tracer;
iter->pos = -1;
/*