diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2009-05-14 09:49:44 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-05-14 09:49:44 +0200 |
| commit | 77f6bf57ba9d2c50173536dbfdacdab27cb867ca (patch) | |
| tree | 09cfb70eb20081d7fc5af21039e3fda7f0b95f84 /fs/splice.c | |
| parent | 4f23122858a27ba97444b9b37a066d83edebd4c8 (diff) | |
| download | linux-stable-77f6bf57ba9d2c50173536dbfdacdab27cb867ca.tar.gz linux-stable-77f6bf57ba9d2c50173536dbfdacdab27cb867ca.tar.bz2 linux-stable-77f6bf57ba9d2c50173536dbfdacdab27cb867ca.zip | |
splice: fix error return code
fs/splice.c: In function 'default_file_splice_read':
fs/splice.c:566: warning: 'error' may be used uninitialized in this function
which is sort-of true. The code will in fact return -ENOMEM instead of the
kernel_readv() return value.
Cc: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs/splice.c')
| -rw-r--r-- | fs/splice.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/splice.c b/fs/splice.c index c5e3c79b95a8..41179c0a655b 100644 --- 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) |