torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

fs/pipe: set FMODE_NOWAIT in create_pipe_files()

Browse Source 
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>
This commit is contained in:
Jens Axboe 2025-05-30 05:25:35 -06:00 committed by Christian Brauner
parent cd95e366c9
commit dd765ba872
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/pipe.c
View File

@ -963,6 +963,11 @@ int create_pipe_files(struct file **res, int flags)
res[1] = f; res[1] = f;
stream_open(inode, res[0]); stream_open(inode, res[0]);
stream_open(inode, res[1]); 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 * Disable permission and pre-content events, but enable legacy
* inotify events for legacy users. * 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); audit_fd_pair(fdr, fdw);
fd[0] = fdr; fd[0] = fdr;
fd[1] = fdw; fd[1] = fdw;
/* pipe groks IOCB_NOWAIT */
files[0]->f_mode |= FMODE_NOWAIT;
files[1]->f_mode |= FMODE_NOWAIT;
return 0; return 0;
err_fdr: err_fdr:

2
io_uring/openclose.c
View File

@ -416,8 +416,6 @@ int io_pipe(struct io_kiocb *req, unsigned int issue_flags)
ret = create_pipe_files(files, p->flags); ret = create_pipe_files(files, p->flags);
if (ret) if (ret)
return ret; return ret;
files[0]->f_mode |= FMODE_NOWAIT;
files[1]->f_mode |= FMODE_NOWAIT;
if (!!p->file_slot) if (!!p->file_slot)
ret = io_pipe_fixed(req, files, issue_flags); ret = io_pipe_fixed(req, files, issue_flags);