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
splice: fix error return code
[safe/jmp/linux-2.6]
/
fs
/
splice.c
diff --git
a/fs/splice.c
b/fs/splice.c
index
c5e3c79
..
41179c0
100644
(file)
--- a/
fs/splice.c
+++ b/
fs/splice.c
@@
-595,8
+595,10
@@
ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
}
res = kernel_readv(in, vec, spd.nr_pages, *ppos);
- if (res < 0)
+ if (res < 0) {
+ error = res;
goto err;
+ }
error = 0;
if (!res)