Merge branch 'drm-next-4.2' of git://people.freedesktop.org/~agd5f/linux

[linux-2.6-block.git] / fs / splice.c

diff --git a/fs/splice.c b/fs/splice.c
index 4f355a1c1a9e87e45678d573ca86a3496d7dd4a5..5fc1e50a7f30c4258c018f560709c54fda005b40 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -360,7 +360,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
                                break;
 
                        error = add_to_page_cache_lru(page, mapping, index,
-                                               GFP_KERNEL);
+                                       GFP_KERNEL & mapping_gfp_mask(mapping));
                        if (unlikely(error)) {
                                page_cache_release(page);
                                if (error == -EEXIST)