]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
io_uring/io-wq: pass io_wq to io_get_next_work()
authorMax Kellermann <max.kellermann@ionos.com>
Tue, 28 Jan 2025 13:39:25 +0000 (14:39 +0100)
committerJens Axboe <axboe@kernel.dk>
Mon, 17 Feb 2025 12:34:45 +0000 (05:34 -0700)
The only caller has already determined this pointer, so let's skip
the redundant dereference.

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
Link: https://lore.kernel.org/r/20250128133927.3989681-7-max.kellermann@ionos.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_uring/io-wq.c

index 6e31f312b61a134ccc33ff7db070af3039764098..f7d328feb7225d809601707e423c86a85ebb1c3c 100644 (file)
@@ -485,13 +485,12 @@ static bool io_wait_on_hash(struct io_wq *wq, unsigned int hash)
 }
 
 static struct io_wq_work *io_get_next_work(struct io_wq_acct *acct,
-                                          struct io_worker *worker)
+                                          struct io_wq *wq)
        __must_hold(acct->lock)
 {
        struct io_wq_work_node *node, *prev;
        struct io_wq_work *work, *tail;
        unsigned int stall_hash = -1U;
-       struct io_wq *wq = worker->wq;
 
        wq_list_for_each(node, prev, &acct->work_list) {
                unsigned int work_flags;
@@ -576,7 +575,7 @@ static void io_worker_handle_work(struct io_wq_acct *acct,
                 * can't make progress, any work completion or insertion will
                 * clear the stalled flag.
                 */
-               work = io_get_next_work(acct, worker);
+               work = io_get_next_work(acct, wq);
                if (work) {
                        /*
                         * Make sure cancelation can find this, even before