Commit d8e435f3 authored Nov 26, 2016 by Linus Torvalds

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

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()

fs/splice.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -408,7 +408,8 @@ static ssize_t default_file_splice_read(struct file in, loff_t ppos,
		if (res <= 0)
		return -ENOMEM;

		nr_pages = res / PAGE_SIZE;
		BUG_ON(dummy);
		nr_pages = DIV_ROUND_UP(res, PAGE_SIZE);

		vec = __vec;
		if (nr_pages > PIPE_DEF_BUFFERS) {