diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-02-12 14:54:51 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-02-12 14:54:58 +0300 |
| commit | 62137364e3e8afcc745846c5c67cacf943149073 (patch) | |
| tree | 42f2bdee6b16e383b6e0a94cb3abc62f335d721a /fs/pipe.c | |
| parent | 6c80408a8a0360fa9223b8c21c0ab8ef42e88bfe (diff) | |
| parent | dcc0b49040c70ad827a7f3d58a21b01fdb14e749 (diff) | |
| download | linux-62137364e3e8afcc745846c5c67cacf943149073.tar.xz | |
Merge branch 'linus' into locking/core, to pick up upstream fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/pipe.c')
| -rw-r--r-- | fs/pipe.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index c5989cfd564d..39c96845a72f 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -1206,6 +1206,7 @@ const struct file_operations pipefifo_fops = { .unlocked_ioctl = pipe_ioctl, .release = pipe_release, .fasync = pipe_fasync, + .splice_write = iter_file_splice_write, }; /* |