diff --git a/[refs] b/[refs] index 78e51eb7f5cf..f2e19ed1e7ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f23122858a27ba97444b9b37a066d83edebd4c8 +refs/heads/master: 77f6bf57ba9d2c50173536dbfdacdab27cb867ca diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c index c5e3c79b95a8..41179c0a655b 100644 --- a/trunk/fs/splice.c +++ b/trunk/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)