X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=fs%2Fsplice.c;h=5fc1e50a7f30c4258c018f560709c54fda005b40;hb=f199b663fc5a276af10a49c24a83d8de27a41b53;hp=bfe62ae40f40920e6b95fa8ce16cc3130b8b0972;hpb=6917aeedabe8e984e72a0bf78d361d2ee656cbe6;p=firefly-linux-kernel-4.4.55.git

diff --git a/fs/splice.c b/fs/splice.c
index bfe62ae40f40..5fc1e50a7f30 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -261,6 +261,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
 
 	return ret;
 }
+EXPORT_SYMBOL_GPL(splice_to_pipe);
 
 void spd_release_page(struct splice_pipe_desc *spd, unsigned int i)
 {
@@ -359,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)