X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=fs%2Fsplice.c;h=78150038b58422155b2a89e47e8a228967f0ca3d;hb=e4671b6bc0b5b488adc5acbcfcbfa6661abec94e;hp=cece15b4ef72e4d82f08c76fa4a41ea9b3093318;hpb=7f3d4ee108c184ab215036051087aaaaa8de7661;p=linux-2.6-omap-h63xx.git diff --git a/fs/splice.c b/fs/splice.c index cece15b4ef7..78150038b58 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1072,7 +1072,7 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *out, ret = splice_direct_to_actor(in, &sd, direct_splice_actor); if (ret > 0) - *ppos = sd.pos; + *ppos += ret; return ret; }