From: Jens Axboe Date: Tue, 26 Mar 2024 00:53:33 +0000 (-0600) Subject: io_uring: use the right type for work_llist empty check X-Git-Tag: v6.8.12~371 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fea4aea0fbc3d1481f689e8dbe0cac52102da755;p=thirdparty%2Fkernel%2Fstable.git io_uring: use the right type for work_llist empty check [ Upstream commit 22537c9f79417fed70b352d54d01d2586fee9521 ] io_task_work_pending() uses wq_list_empty() on ctx->work_llist, but it's not an io_wq_work_list, it's a struct llist_head. They both have ->first as head-of-list, and it turns out the checks are identical. But be proper and use the right helper. Fixes: dac6a0eae793 ("io_uring: ensure iopoll runs local task work as well") Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h index d5495710c1787..c0cff024db7b4 100644 --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -301,7 +301,7 @@ static inline int io_run_task_work(void) static inline bool io_task_work_pending(struct io_ring_ctx *ctx) { - return task_work_pending(current) || !wq_list_empty(&ctx->work_llist); + return task_work_pending(current) || !llist_empty(&ctx->work_llist); } static inline void io_tw_lock(struct io_ring_ctx *ctx, struct io_tw_state *ts)