diff options
| author | Christian Brauner <brauner@kernel.org> | 2023-12-21 13:21:52 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2023-12-21 13:21:52 +0100 |
| commit | 2137e1564267001b25143d21bc619189c1f74bc6 (patch) | |
| tree | e5d680049a77852f4cde8aa396c0faa72de4c854 /fs/namei.c | |
| parent | 1bfc466b13cf6652ba227c282c27a30ffede69a5 (diff) | |
| parent | 4e94ddfe2aab72139acb8d5372fac9e6c3f3e383 (diff) | |
Merge branch 'vfs.file'
Bring in the changes to the file infrastructure for this cycle. Mostly
cleanups and some performance tweaks.
* file: remove __receive_fd()
* file: stop exposing receive_fd_user()
* fs: replace f_rcuhead with f_task_work
* file: remove pointless wrapper
* file: s/close_fd_get_file()/file_close_fd()/g
* Improve __fget_files_rcu() code generation (and thus __fget_light())
* file: massage cleanup of files that failed to open
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/namei.c b/fs/namei.c index a1124bf29b3b..faae721e4d63 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3785,10 +3785,7 @@ static struct file *path_openat(struct nameidata *nd, WARN_ON(1); error = -EINVAL; } - if (unlikely(file->f_mode & FMODE_OPENED)) - fput(file); - else - release_empty_file(file); + fput(file); if (error == -EOPENSTALE) { if (flags & LOOKUP_RCU) error = -ECHILD; |