Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Pull vfs splice fix from Al Viro.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fix default_file_splice_read()

Linus Torvalds 9 years ago d8e435f3 e3480312

+2 -1

1 changed file

expand all

splice.c

+2 -1

fs/splice.c

··· 408 if (res <= 0) 409 return -ENOMEM; 410 411 - nr_pages = res / PAGE_SIZE; 412 413 vec = __vec; 414 if (nr_pages > PIPE_DEF_BUFFERS) {

··· 408 if (res <= 0) 409 return -ENOMEM; 410 411 + BUG_ON(dummy); 412 + nr_pages = DIV_ROUND_UP(res, PAGE_SIZE); 413 414 vec = __vec; 415 if (nr_pages > PIPE_DEF_BUFFERS) {