From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2F81228EB for ; Mon, 30 Jan 2023 14:05:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83BCCC4339C; Mon, 30 Jan 2023 14:05:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1675087543; bh=PKpDEyB/Gg75JO9WN04qmkYMSwEnxBPl3ql+1/TDB50=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GJeCrGrfU1pNQm+AeMHtg16sXBNmhE4flVPXKBCjKZ3Gk9NYbcekM0Qvr53UOn7HQ lvWxVwtqu6+inT11Tm9hQF8DPSRNUCIfjYgnDAefXJhWzgB7cfUN/j1To5MHCdQVoQ YXnlvNMchXIoA0Yo+uizOyiEXM9l1NBwlzU3qH4A= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pavel Begunkov , Jens Axboe , Sasha Levin Subject: [PATCH 6.1 243/313] io_uring: use io_req_task_complete() in timeout Date: Mon, 30 Jan 2023 14:51:18 +0100 Message-Id: <20230130134348.005000064@linuxfoundation.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230130134336.532886729@linuxfoundation.org> References: <20230130134336.532886729@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Pavel Begunkov [ Upstream commit 624fd779fd869bdcb2c0ccca0f09456eed71ed52 ] Use a more generic io_req_task_complete() in timeout completion task_work instead of io_req_complete_post(). Signed-off-by: Pavel Begunkov Link: https://lore.kernel.org/r/bda1710b58c07bf06107421c2a65c529ea9cdcac.1669203009.git.asml.silence@gmail.com Signed-off-by: Jens Axboe Stable-dep-of: ef5c600adb1d ("io_uring: always prep_async for drain requests") Signed-off-by: Sasha Levin --- io_uring/timeout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/io_uring/timeout.c b/io_uring/timeout.c index 06200fe73a04..16b006bbbb11 100644 --- a/io_uring/timeout.c +++ b/io_uring/timeout.c @@ -284,11 +284,11 @@ static void io_req_task_link_timeout(struct io_kiocb *req, bool *locked) ret = io_try_cancel(req->task->io_uring, &cd, issue_flags); } io_req_set_res(req, ret ?: -ETIME, 0); - io_req_complete_post(req); + io_req_task_complete(req, locked); io_put_req(prev); } else { io_req_set_res(req, -ETIME, 0); - io_req_complete_post(req); + io_req_task_complete(req, locked); } } -- 2.39.0