From: Jens Axboe Date: Fri, 23 May 2025 12:04:29 +0000 (-0600) Subject: io_uring/io-wq: move hash helpers to the top X-Git-Tag: for-6.16/io_uring-20250523~3 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e37dfc0530815ead6e8ddab2a4ccce3be31af954;p=linux-block.git io_uring/io-wq: move hash helpers to the top Just in preparation for using them higher up in the function, move these generic helpers. Signed-off-by: Jens Axboe --- diff --git a/io_uring/io-wq.c b/io_uring/io-wq.c index d52069b1177b..d36d0bd9847d 100644 --- a/io_uring/io-wq.c +++ b/io_uring/io-wq.c @@ -150,6 +150,16 @@ static bool io_acct_cancel_pending_work(struct io_wq *wq, static void create_worker_cb(struct callback_head *cb); static void io_wq_cancel_tw_create(struct io_wq *wq); +static inline unsigned int __io_get_work_hash(unsigned int work_flags) +{ + return work_flags >> IO_WQ_HASH_SHIFT; +} + +static inline unsigned int io_get_work_hash(struct io_wq_work *work) +{ + return __io_get_work_hash(atomic_read(&work->flags)); +} + static bool io_worker_get(struct io_worker *worker) { return refcount_inc_not_zero(&worker->ref); @@ -454,16 +464,6 @@ static void __io_worker_idle(struct io_wq_acct *acct, struct io_worker *worker) } } -static inline unsigned int __io_get_work_hash(unsigned int work_flags) -{ - return work_flags >> IO_WQ_HASH_SHIFT; -} - -static inline unsigned int io_get_work_hash(struct io_wq_work *work) -{ - return __io_get_work_hash(atomic_read(&work->flags)); -} - static bool io_wait_on_hash(struct io_wq *wq, unsigned int hash) { bool ret = false;