tracing: update file->f_pos when splice(2) it
authorLai Jiangshan <laijs@cn.fujitsu.com>
Thu, 2 Apr 2009 07:17:04 +0000 (15:17 +0800)
committerIngo Molnar <mingo@elte.hu>
Fri, 10 Apr 2009 10:44:44 +0000 (12:44 +0200)
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>
kernel/trace/trace.c

index 8e189ff..9462976 100644 (file)
@@ -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;
@@ -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;