lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

splice: fix error return code

Browse Source 
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>
This commit is contained in:
Andrew Morton
2009-05-14 09:49:44 +02:00
committed by Jens Axboe
parent 4f23122858
commit 77f6bf57ba
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/splice.c
View File

@@ -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); res = kernel_readv(in, vec, spd.nr_pages, *ppos);
if (res < 0) if (res < 0) {
error = res;
goto err; goto err;
}
error = 0; error = 0;
if (!res) if (!res)