git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-cpufreq'
[sfrench/cifs-2.6.git]
/
fs
/
splice.c
diff --git
a/fs/splice.c
b/fs/splice.c
index 4ef78aa8ef61e8d0f091fe4088bc7c28035b5ef1..006ba50f4ece671f48367b644641ab58b04b65d8 100644
(file)
--- a/
fs/splice.c
+++ b/
fs/splice.c
@@
-33,6
+33,8
@@
#include <linux/gfp.h>
#include <linux/socket.h>
#include <linux/compat.h>
#include <linux/gfp.h>
#include <linux/socket.h>
#include <linux/compat.h>
+#include <linux/sched/signal.h>
+
#include "internal.h"
/*
#include "internal.h"
/*
@@
-307,7
+309,7
@@
ssize_t generic_file_splice_read(struct file *in, loff_t *ppos,
idx = to.idx;
init_sync_kiocb(&kiocb, in);
kiocb.ki_pos = *ppos;
idx = to.idx;
init_sync_kiocb(&kiocb, in);
kiocb.ki_pos = *ppos;
- ret =
in->f_op->read_iter(
&kiocb, &to);
+ ret =
call_read_iter(in,
&kiocb, &to);
if (ret > 0) {
*ppos = kiocb.ki_pos;
file_accessed(in);
if (ret > 0) {
*ppos = kiocb.ki_pos;
file_accessed(in);