tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

fix default_file_splice_read()

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>

Al Viro 8e54cada 3ad0e83c

options
unified split
Changed files
+2 -1
fs
splice.c
+2 -1
fs/splice.c
··· 408 408 if (res <= 0) 409 409 return -ENOMEM; 410 410 411 - nr_pages = res / PAGE_SIZE; 411 + BUG_ON(dummy); 412 + nr_pages = DIV_ROUND_UP(res, PAGE_SIZE); 412 413 413 414 vec = __vec; 414 415 if (nr_pages > PIPE_DEF_BUFFERS) {