git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Revert "relay: fix splice problem"
[safe/jmp/linux-2.6]
/
fs
/
splice.c
diff --git
a/fs/splice.c
b/fs/splice.c
index
cece15b
..
7815003
100644
(file)
--- 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;
}