|
@@ -4890,19 +4890,20 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
|
|
|
struct trace_iterator *iter = filp->private_data;
|
|
|
ssize_t sret;
|
|
|
|
|
|
- /* return any leftover data */
|
|
|
- sret = trace_seq_to_user(&iter->seq, ubuf, cnt);
|
|
|
- if (sret != -EBUSY)
|
|
|
- return sret;
|
|
|
-
|
|
|
- trace_seq_init(&iter->seq);
|
|
|
-
|
|
|
/*
|
|
|
* Avoid more than one consumer on a single file descriptor
|
|
|
* This is just a matter of traces coherency, the ring buffer itself
|
|
|
* is protected.
|
|
|
*/
|
|
|
mutex_lock(&iter->mutex);
|
|
|
+
|
|
|
+ /* return any leftover data */
|
|
|
+ sret = trace_seq_to_user(&iter->seq, ubuf, cnt);
|
|
|
+ if (sret != -EBUSY)
|
|
|
+ goto out;
|
|
|
+
|
|
|
+ trace_seq_init(&iter->seq);
|
|
|
+
|
|
|
if (iter->trace->read) {
|
|
|
sret = iter->trace->read(iter, filp, ubuf, cnt, ppos);
|
|
|
if (sret)
|