diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-04-11 11:14:12 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-04-11 11:14:14 +1000 |
| commit | f201cb890e4bb3e7c17bbd90ddf412099a50f601 (patch) | |
| tree | aded27e0aadc805483d1b6ee528e989aa0e55658 /fs/proc/inode.c | |
| parent | ebf6ec5bb7f6b214f201f7f7ce1a8c90dfcf1253 (diff) | |
| parent | 064c5a3dc42057b1bf0d224aaa88616c032496e1 (diff) | |
| download | linux-next-f201cb890e4bb3e7c17bbd90ddf412099a50f601.tar.gz | |
Merge branch 'for-next' of git://git.kernel.dk/linux-block.git
Diffstat (limited to 'fs/proc/inode.c')
| -rw-r--r-- | fs/proc/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c index f495fdb39151..711f12706469 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -591,7 +591,7 @@ static const struct file_operations proc_iter_file_ops = { .llseek = proc_reg_llseek, .read_iter = proc_reg_read_iter, .write = proc_reg_write, - .splice_read = generic_file_splice_read, + .splice_read = direct_splice_read, .poll = proc_reg_poll, .unlocked_ioctl = proc_reg_unlocked_ioctl, .mmap = proc_reg_mmap, @@ -617,7 +617,7 @@ static const struct file_operations proc_reg_file_ops_compat = { static const struct file_operations proc_iter_file_ops_compat = { .llseek = proc_reg_llseek, .read_iter = proc_reg_read_iter, - .splice_read = generic_file_splice_read, + .splice_read = direct_splice_read, .write = proc_reg_write, .poll = proc_reg_poll, .unlocked_ioctl = proc_reg_unlocked_ioctl, |