commit d8e435f3ab6fea2ea324dce72b51dd7761747523
author Linus Torvalds <torvalds@linux-foundation.org> Sat Nov 26 17:21:13 2016 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Sat Nov 26 17:21:13 2016 -0800
tree cb754f8e125e7dcfe40d3a17d035fa31e99d914b
parent e348031214d5dce67be93271433b27a93cba5b3f
parent 8e54cadab447dae779f80f79c87cbeaea9594f60

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

diff --git a/fs/splice.c b/fs/splice.c
index dcaf185..5a7750b 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -408,7 +408,8 @@
 	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) {