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 BED9528EB for ; Mon, 30 Jan 2023 14:07:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3BC67C433EF; Mon, 30 Jan 2023 14:07:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1675087625; bh=c8ZVW4xjWEJnhftBdbzNSiYJSGcA/I0CN+tSqmItAbw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LGjtYTwp9MBYVYEf5ToIGVBoklw4HUyhtLkJmhBD6ocoaO9/JSk72f1p0JN1c30F0 OzXrpPwIObEZ/nsch+gcTCL+uHkfi23v91BqyMYwo5CIHFxBIMYcom+W9PoxwTbcvX UCfmp/g1qWgB3QQF+iFPnQhd74iMHcfsF37dk6s0= 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 241/313] io_uring: inline __io_req_complete_post() Date: Mon, 30 Jan 2023 14:51:16 +0100 Message-Id: <20230130134347.913633952@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 f9d567c75ec216447f36da6e855500023504fa04 ] There is only one user of __io_req_complete_post(), inline it. Signed-off-by: Pavel Begunkov Link: https://lore.kernel.org/r/ef4c9059950a3da5cf68df00f977f1fd13bd9306.1668597569.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/io_uring.c | 11 +++-------- io_uring/io_uring.h | 1 - 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index b4f9707730b8..9b1c917c99d9 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -854,19 +854,14 @@ static void __io_req_complete_put(struct io_kiocb *req) } } -void __io_req_complete_post(struct io_kiocb *req) -{ - if (!(req->flags & REQ_F_CQE_SKIP)) - __io_fill_cqe_req(req->ctx, req); - __io_req_complete_put(req); -} - void io_req_complete_post(struct io_kiocb *req) { struct io_ring_ctx *ctx = req->ctx; io_cq_lock(ctx); - __io_req_complete_post(req); + if (!(req->flags & REQ_F_CQE_SKIP)) + __io_fill_cqe_req(ctx, req); + __io_req_complete_put(req); io_cq_unlock_post(ctx); } diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h index 56ecc1550476..0cf544ba6656 100644 --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -33,7 +33,6 @@ int io_run_local_work(struct io_ring_ctx *ctx); void io_req_complete_failed(struct io_kiocb *req, s32 res); void __io_req_complete(struct io_kiocb *req, unsigned issue_flags); void io_req_complete_post(struct io_kiocb *req); -void __io_req_complete_post(struct io_kiocb *req); bool io_post_aux_cqe(struct io_ring_ctx *ctx, u64 user_data, s32 res, u32 cflags, bool allow_overflow); bool io_fill_cqe_aux(struct io_ring_ctx *ctx, u64 user_data, s32 res, u32 cflags, -- 2.39.0