Skip to content

Commit 50d910d

Browse files
committed
io_uring: use files_lookup_fd_locked()
While valid we don't need to open-code rcu dereferences if we're acquiring file_lock anyway. Suggested-by: Al Viro <viro@zeniv.linux.org.uk> Link: https://lore.kernel.org/r/20231010030615.GO800259@ZenIV Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent 0ede61d commit 50d910d

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

io_uring/openclose.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ int io_close(struct io_kiocb *req, unsigned int issue_flags)
220220
{
221221
struct files_struct *files = current->files;
222222
struct io_close *close = io_kiocb_to_cmd(req, struct io_close);
223-
struct fdtable *fdt;
224223
struct file *file;
225224
int ret = -EBADF;
226225

@@ -230,13 +229,7 @@ int io_close(struct io_kiocb *req, unsigned int issue_flags)
230229
}
231230

232231
spin_lock(&files->file_lock);
233-
fdt = files_fdtable(files);
234-
if (close->fd >= fdt->max_fds) {
235-
spin_unlock(&files->file_lock);
236-
goto err;
237-
}
238-
file = rcu_dereference_protected(fdt->fd[close->fd],
239-
lockdep_is_held(&files->file_lock));
232+
file = files_lookup_fd_locked(files, close->fd);
240233
if (!file || io_is_uring_fops(file)) {
241234
spin_unlock(&files->file_lock);
242235
goto err;

0 commit comments

Comments
 (0)