diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-05-11 09:06:26 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-05-11 09:06:55 -0700 |
| commit | bc88ba0cad64a4aa85f9deca79c6f3addcd21795 (patch) | |
| tree | 66db8412b3f65bf19645611afee4b1dbe14b74a8 /fs/pipe.c | |
| parent | 285b2a46953cecea207c53f7c6a7a76c9bbab303 (diff) | |
| parent | 6e27831b91a0bc572902eb065b374991c1ef452a (diff) | |
| download | linux-bc88ba0cad64a4aa85f9deca79c6f3addcd21795.tar.gz linux-bc88ba0cad64a4aa85f9deca79c6f3addcd21795.tar.bz2 linux-bc88ba0cad64a4aa85f9deca79c6f3addcd21795.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes. No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'fs/pipe.c')
| -rw-r--r-- | fs/pipe.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index 42c7ff41c2db..ceb17d2dfa19 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -976,6 +976,9 @@ static int __do_pipe_flags(int *fd, struct file **files, int flags) audit_fd_pair(fdr, fdw); fd[0] = fdr; fd[1] = fdw; + /* pipe groks IOCB_NOWAIT */ + files[0]->f_mode |= FMODE_NOWAIT; + files[1]->f_mode |= FMODE_NOWAIT; return 0; err_fdr: |