From 5ecc65f5382138d94984a4da1df004a32e087839 Mon Sep 17 00:00:00 2001 From: Pavel Begunkov Date: Thu, 21 Nov 2019 23:21:01 +0300 Subject: [PATCH 1045/2944] io_uring: pass only !null to io_req_find_next() to #26323578 commit 944e58bfeda0e9b97cd611adafc823c78e0bc464 upstream. Make io_req_find_next() and io_req_link_next() to accept only non-null nxt, and handle it in callers. Signed-off-by: Pavel Begunkov Signed-off-by: Jens Axboe Signed-off-by: Joseph Qi Acked-by: Xiaoguang Wang --- fs/io_uring.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index ef9184a..629adc8 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -913,7 +913,7 @@ static void io_req_link_next(struct io_kiocb *req, struct io_kiocb **nxtptr) * in this context instead of having to queue up new async work. */ if (nxt) { - if (nxtptr && io_wq_current_is_worker()) + if (io_wq_current_is_worker()) *nxtptr = nxt; else io_queue_async_work(nxt); @@ -991,8 +991,13 @@ static void io_req_find_next(struct io_kiocb *req, struct io_kiocb **nxt) static void io_free_req(struct io_kiocb *req) { - io_req_find_next(req, NULL); + struct io_kiocb *nxt = NULL; + + io_req_find_next(req, &nxt); __io_free_req(req); + + if (nxt) + io_queue_async_work(nxt); } /* -- 1.8.3.1