diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-12-12 15:42:24 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-12-12 15:42:24 +0100 |
| commit | 2394b311c6b5bab225e5307c819eb1ea59de49de (patch) | |
| tree | cae55cbcff25341023c3d93952610935bd0fa3ff /io_uring | |
| parent | Linux 6.7-rc5 (diff) | |
| parent | file: remove __receive_fd() (diff) | |
| download | linux-2394b311c6b5bab225e5307c819eb1ea59de49de.tar.xz linux-2394b311c6b5bab225e5307c819eb1ea59de49de.zip | |
Merge branch 'vfs.file' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs into for-6.8/io_uring
Merge vfs.file from the VFS tree to avoid conflicts with receive_fd() now
having 3 arguments rather than just 2.
* 'vfs.file' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
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
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/openclose.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/io_uring/openclose.c b/io_uring/openclose.c index fb73adb89067..74fc22461f48 100644 --- a/io_uring/openclose.c +++ b/io_uring/openclose.c @@ -241,7 +241,7 @@ int io_close(struct io_kiocb *req, unsigned int issue_flags) return -EAGAIN; } - file = __close_fd_get_file(close->fd); + file = file_close_fd_locked(files, close->fd); spin_unlock(&files->file_lock); if (!file) goto err; |