Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix default_file_splice_read()

Browse source 
Botched calculation of number of pages.  As the result,
we were dropping pieces when doing splice to pipe from
e.g. 9p.

Reported-by: Alexei Starovoitov <ast@kernel.org>
Tested-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2016-11-26 20:05:42 -05:00
parent 3ad0e83cf8
commit 8e54cadab4
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs/splice.c
View file

@ -408,7 +408,8 @@ static ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
if (res <= 0) if (res <= 0)
return -ENOMEM; return -ENOMEM;
nr_pages = res / PAGE_SIZE; BUG_ON(dummy);
nr_pages = DIV_ROUND_UP(res, PAGE_SIZE);
vec = __vec; vec = __vec;
if (nr_pages > PIPE_DEF_BUFFERS) { if (nr_pages > PIPE_DEF_BUFFERS) {