Skip to content

Commit

Permalink
tracing: update file->f_pos when splice(2) it
Browse files Browse the repository at this point in the history
Impact: Cleanup

These two lines:

	if (unlikely(*ppos))
		return -ESPIPE;

in tracing_buffers_splice_read() are not needed, VFS layer
has disabled seek(2).

We remove these two lines, and then we can update file->f_pos.

And tracing_buffers_read() updates file->f_pos, this fix
make tracing_buffers_splice_read() updates file->f_pos too.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <srostedt@redhat.com>
LKML-Reference: <49D46670.4010503@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Lai Jiangshan authored and Ingo Molnar committed Apr 10, 2009
1 parent ddd538f commit c7625a5
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -3428,13 +3428,6 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
int size, i;
size_t ret;

/*
* We can't seek on a buffer input
*/
if (unlikely(*ppos))
return -ESPIPE;


for (i = 0; i < PIPE_BUFFERS && len; i++, len -= size) {
struct page *page;
int r;
Expand Down Expand Up @@ -3474,6 +3467,7 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
spd.partial[i].offset = 0;
spd.partial[i].private = (unsigned long)ref;
spd.nr_pages++;
*ppos += size;
}

spd.nr_pages = i;
Expand Down

0 comments on commit c7625a5

Please sign in to comment.