io_uring: refactor io_close

A small refactoring shrinking it and making easier to read.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/19b24eed7cd491a0243b50366dd2a23b558e2665.1618101759.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 8e2a0f9..f886a5b 100644 (file)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -4181,11 +4181,9 @@ static int io_close(struct io_kiocb *req, unsigned int issue_flags)
        struct files_struct *files = current->files;
        struct io_close *close = &req->close;
        struct fdtable *fdt;
-       struct file *file;
-       int ret;
+       struct file *file = NULL;
+       int ret = -EBADF;
 
-       file = NULL;
-       ret = -EBADF;
        spin_lock(&files->file_lock);
        fdt = files_fdtable(files);
        if (close->fd >= fdt->max_fds) {
@@ -4193,12 +4191,7 @@ static int io_close(struct io_kiocb *req, unsigned int issue_flags)
                goto err;
        }
        file = fdt->fd[close->fd];
-       if (!file) {
-               spin_unlock(&files->file_lock);
-               goto err;
-       }
-
-       if (file->f_op == &io_uring_fops) {
+       if (!file || file->f_op == &io_uring_fops) {
                spin_unlock(&files->file_lock);
                file = NULL;
                goto err;