Commit d8e435f3 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://

Pull vfs splice fix from Al Viro.

* 'for-linus' of git://
  fix default_file_splice_read()
parents e3480312 8e54cada
......@@ -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;
nr_pages = DIV_ROUND_UP(res, PAGE_SIZE);
vec = __vec;
if (nr_pages > PIPE_DEF_BUFFERS) {
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment