projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: dsa: Do not override PHY interface if already configured
[deliverable/linux.git]
/
fs
/
splice.c
diff --git
a/fs/splice.c
b/fs/splice.c
index bfe62ae40f40920e6b95fa8ce16cc3130b8b0972..5fc1e50a7f30c4258c018f560709c54fda005b40 100644
(file)
--- a/
fs/splice.c
+++ b/
fs/splice.c
@@
-261,6
+261,7
@@
ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
return ret;
}
return ret;
}
+EXPORT_SYMBOL_GPL(splice_to_pipe);
void spd_release_page(struct splice_pipe_desc *spd, unsigned int i)
{
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,
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)
if (unlikely(error)) {
page_cache_release(page);
if (error == -EEXIST)
This page took
0.044024 seconds
and
5
git commands to generate.