]> git.baikalelectronics.ru Git - kernel.git/commitdiff
io_uring: remove sqo_task
authorPavel Begunkov <asml.silence@gmail.com>
Mon, 1 Mar 2021 13:02:16 +0000 (13:02 +0000)
committerJens Axboe <axboe@kernel.dk>
Thu, 4 Mar 2021 13:37:57 +0000 (06:37 -0700)
Now, sqo_task is used only for a warning that is not interesting anymore
since sqo_dead is gone, remove all of that including ctx->sqo_task.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c

index 6090a380e903a56312cda51c9c44d2f5771e851a..f060dcc1cc8642b3c7df1ffbbd34343b08c6f613 100644 (file)
@@ -379,11 +379,6 @@ struct io_ring_ctx {
 
        struct io_rings *rings;
 
-       /*
-        * For SQPOLL usage
-        */
-       struct task_struct      *sqo_task;
-
        /* Only used for accounting purposes */
        struct mm_struct        *mm_account;
 
@@ -8747,10 +8742,6 @@ static int io_uring_add_task_file(struct io_ring_ctx *ctx, struct file *file)
                                fput(file);
                                return ret;
                        }
-
-                       /* one and only SQPOLL file note, held by sqo_task */
-                       WARN_ON_ONCE((ctx->flags & IORING_SETUP_SQPOLL) &&
-                                    current != ctx->sqo_task);
                }
                tctx->last = file;
        }
@@ -9376,7 +9367,6 @@ static int io_uring_create(unsigned entries, struct io_uring_params *p,
        ctx->compat = in_compat_syscall();
        if (!capable(CAP_IPC_LOCK))
                ctx->user = get_uid(current_user());
-       ctx->sqo_task = current;
 
        /*
         * This is just grabbed for accounting purposes. When a process exits,