[PATCH] trace-cmd record: Use result of fcntl(GETPIPE_SZ)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: "Steven Rostedt (Google)" <rostedt@xxxxxxxxxxx>

For some reason, I thought the arg to fcntl(fd, F_GETPIPE_SZ, &arg) would
give the pipe size. But the argument is completely ignored (I remember
testing this, and it worked :-/)

The return of the function is the pipe size. Use that if pipe_size is
untouched (which it ought to be) as the pipe size.

Fixes: a64fab23cec2 ("trace-cmd recorder: Use full pipe size in splice_data()")
Signed-off-by: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>
---
 lib/trace-cmd/trace-recorder.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/trace-cmd/trace-recorder.c b/lib/trace-cmd/trace-recorder.c
index c7ef13c851d2..25c26def3784 100644
--- a/lib/trace-cmd/trace-recorder.c
+++ b/lib/trace-cmd/trace-recorder.c
@@ -204,7 +204,9 @@ tracecmd_create_buffer_recorder_fd2(int fd, int fd2, int cpu, unsigned flags,
 		 * back to using page_size for splice(). It could also return
 		 * success, but not modify pipe_size.
 		 */
-		if (ret < 0 || !pipe_size)
+		if (ret > 0 && !pipe_size)
+			pipe_size = ret;
+		else if (ret < 0)
 			pipe_size = recorder->page_size;
 
 		recorder->pipe_size = pipe_size;
-- 
2.35.1




[Index of Archives]     [Linux USB Development]     [Linux USB Development]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux