|
@@ -5930,9 +5930,6 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
|
|
|
return -EBUSY;
|
|
|
#endif
|
|
|
|
|
|
- if (splice_grow_spd(pipe, &spd))
|
|
|
- return -ENOMEM;
|
|
|
-
|
|
|
if (*ppos & (PAGE_SIZE - 1))
|
|
|
return -EINVAL;
|
|
|
|
|
@@ -5942,6 +5939,9 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
|
|
|
len &= PAGE_MASK;
|
|
|
}
|
|
|
|
|
|
+ if (splice_grow_spd(pipe, &spd))
|
|
|
+ return -ENOMEM;
|
|
|
+
|
|
|
again:
|
|
|
trace_access_lock(iter->cpu_file);
|
|
|
entries = ring_buffer_entries_cpu(iter->trace_buffer->buffer, iter->cpu_file);
|
|
@@ -5999,19 +5999,21 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
|
|
|
/* did we read anything? */
|
|
|
if (!spd.nr_pages) {
|
|
|
if (ret)
|
|
|
- return ret;
|
|
|
+ goto out;
|
|
|
|
|
|
+ ret = -EAGAIN;
|
|
|
if ((file->f_flags & O_NONBLOCK) || (flags & SPLICE_F_NONBLOCK))
|
|
|
- return -EAGAIN;
|
|
|
+ goto out;
|
|
|
|
|
|
ret = wait_on_pipe(iter, true);
|
|
|
if (ret)
|
|
|
- return ret;
|
|
|
+ goto out;
|
|
|
|
|
|
goto again;
|
|
|
}
|
|
|
|
|
|
ret = splice_to_pipe(pipe, &spd);
|
|
|
+out:
|
|
|
splice_shrink_spd(&spd);
|
|
|
|
|
|
return ret;
|