missing bits of "splice: fix racy pipe->buffers uses"

[linux-block.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index 17d3799d04bdbead0215968710e943cfec437977..37400a148f29e5bf99611ecdf8dbed44212248fd 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1613,7 +1613,7 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos,
        index = *ppos >> PAGE_CACHE_SHIFT;
        loff = *ppos & ~PAGE_CACHE_MASK;
        req_pages = (len + loff + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
-       nr_pages = min(req_pages, pipe->buffers);
+       nr_pages = min(req_pages, spd.nr_pages_max);
 
        spd.nr_pages = find_get_pages_contig(mapping, index,
                                                nr_pages, spd.pages);