Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8487c237 authored by Steven Rostedt's avatar Steven Rostedt Committed by Thomas Gleixner
Browse files

ftrace: allow trace_pipe to block on all reads 



We expect things like "cat" to block on reads to trace_pipe. That's what
trace_pipe is for.

Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d17d9691

kernel/trace/trace.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -2231,8 +2231,6 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, 
	start = 0;

	start = 0;





	while (trace_empty(iter)) {

	while (trace_empty(iter)) {

		if (!(trace_flags & TRACE_ITER_BLOCK))

			return -EWOULDBLOCK;

		/*

		/*

		 * This is a make-shift waitqueue. The reason we don't use

		 * This is a make-shift waitqueue. The reason we don't use

		 * an actual wait queue is because:

		 * an actual wait queue is because: