diff options
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 6 | 
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 68032c6177d..28848808222 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -3609,6 +3609,7 @@ static ssize_t tracing_splice_read_pipe(struct file *filp,  		.pages		= pages_def,  		.partial	= partial_def,  		.nr_pages	= 0, /* This gets updated below. */ +		.nr_pages_max	= PIPE_DEF_BUFFERS,  		.flags		= flags,  		.ops		= &tracing_pipe_buf_ops,  		.spd_release	= tracing_spd_release_pipe, @@ -3680,7 +3681,7 @@ static ssize_t tracing_splice_read_pipe(struct file *filp,  	ret = splice_to_pipe(pipe, &spd);  out: -	splice_shrink_spd(pipe, &spd); +	splice_shrink_spd(&spd);  	return ret;  out_err: @@ -4231,6 +4232,7 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,  	struct splice_pipe_desc spd = {  		.pages		= pages_def,  		.partial	= partial_def, +		.nr_pages_max	= PIPE_DEF_BUFFERS,  		.flags		= flags,  		.ops		= &buffer_pipe_buf_ops,  		.spd_release	= buffer_spd_release, @@ -4318,7 +4320,7 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,  	}  	ret = splice_to_pipe(pipe, &spd); -	splice_shrink_spd(pipe, &spd); +	splice_shrink_spd(&spd);  out:  	return ret;  }  |