diff options
| author | Jens Axboe <axboe@kernel.dk> | 2025-05-30 05:25:35 -0600 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-06-10 13:16:19 +0200 |
| commit | dd765ba8723958514eab2fc742bef69019a21069 (patch) | |
| tree | 00732bae3e8998760fa441755aeb1e651557ea2b | |
| parent | cd95e366c9e380ca4fbe91cb38756f06d2ad869f (diff) | |
fs/pipe: set FMODE_NOWAIT in create_pipe_files()
Rather than have the caller set the FMODE_NOWAIT flags for both output
files, move it to create_pipe_files() where other f_mode flags are set
anyway with stream_open(). With that, both __do_pipe_flags() and
io_pipe() can remove the manual setting of the NOWAIT flags.
No intended functional changes, just a code cleanup.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Link: https://lore.kernel.org/1f0473f8-69f3-4eb1-aa77-3334c6a71d24@kernel.dk
Signed-off-by: Christian Brauner <brauner@kernel.org>
| -rw-r--r-- | fs/pipe.c | 8 | ||||
| -rw-r--r-- | io_uring/openclose.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index 45077c37bad1..731622d0738d 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -963,6 +963,11 @@ int create_pipe_files(struct file **res, int flags) res[1] = f; stream_open(inode, res[0]); stream_open(inode, res[1]); + + /* pipe groks IOCB_NOWAIT */ + res[0]->f_mode |= FMODE_NOWAIT; + res[1]->f_mode |= FMODE_NOWAIT; + /* * Disable permission and pre-content events, but enable legacy * inotify events for legacy users. @@ -997,9 +1002,6 @@ 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: diff --git a/io_uring/openclose.c b/io_uring/openclose.c index 83e36ad4e31b..d70700e5cef8 100644 --- a/io_uring/openclose.c +++ b/io_uring/openclose.c @@ -416,8 +416,6 @@ int io_pipe(struct io_kiocb *req, unsigned int issue_flags) ret = create_pipe_files(files, p->flags); if (ret) return ret; - files[0]->f_mode |= FMODE_NOWAIT; - files[1]->f_mode |= FMODE_NOWAIT; if (!!p->file_slot) ret = io_pipe_fixed(req, files, issue_flags); |