From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH 09/11] io_uring: inline __io_queue_linked_timeout()
Date: Thu, 4 Mar 2021 18:52:23 +0000 [thread overview]
Message-ID: <136531d2aacb68edbd43f5c06bf6a84b957e8be1.1614883424.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
Inline __io_queue_linked_timeout(), we don't need it
Signed-off-by: Pavel Begunkov <[email protected]>
---
fs/io_uring.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index da5d8d962bff..c05579ac7bb7 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -995,7 +995,6 @@ static void io_dismantle_req(struct io_kiocb *req);
static void io_put_task(struct task_struct *task, int nr);
static void io_queue_next(struct io_kiocb *req);
static struct io_kiocb *io_prep_linked_timeout(struct io_kiocb *req);
-static void __io_queue_linked_timeout(struct io_kiocb *req);
static void io_queue_linked_timeout(struct io_kiocb *req);
static int __io_sqe_files_update(struct io_ring_ctx *ctx,
struct io_uring_rsrc_update *ip,
@@ -6126,8 +6125,11 @@ static enum hrtimer_restart io_link_timeout_fn(struct hrtimer *timer)
return HRTIMER_NORESTART;
}
-static void __io_queue_linked_timeout(struct io_kiocb *req)
+static void io_queue_linked_timeout(struct io_kiocb *req)
{
+ struct io_ring_ctx *ctx = req->ctx;
+
+ spin_lock_irq(&ctx->completion_lock);
/*
* If the back reference is NULL, then our linked request finished
* before we got a chance to setup the timer
@@ -6139,16 +6141,7 @@ static void __io_queue_linked_timeout(struct io_kiocb *req)
hrtimer_start(&data->timer, timespec64_to_ktime(data->ts),
data->mode);
}
-}
-
-static void io_queue_linked_timeout(struct io_kiocb *req)
-{
- struct io_ring_ctx *ctx = req->ctx;
-
- spin_lock_irq(&ctx->completion_lock);
- __io_queue_linked_timeout(req);
spin_unlock_irq(&ctx->completion_lock);
-
/* drop submission reference */
io_put_req(req);
}
--
2.24.0
next prev parent reply other threads:[~2021-03-04 18:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-04 18:52 [PATCH 5.13 00/11] a second batch for 5.13 Pavel Begunkov
2021-03-04 18:52 ` [PATCH 01/11] io_uring: don't take ctx refs in task_work handler Pavel Begunkov
2021-03-04 18:52 ` [PATCH 02/11] io_uring: optimise io_uring_enter() Pavel Begunkov
2021-03-04 18:52 ` [PATCH 03/11] io_uring: move setting tctx->sqpoll from hot path Pavel Begunkov
2021-03-04 18:52 ` [PATCH 04/11] io_uring: inline io_clean_op() fast path Pavel Begunkov
2021-03-04 18:52 ` [PATCH 05/11] io_uring: optimise io_dismantle_req() " Pavel Begunkov
2021-03-04 18:52 ` [PATCH 06/11] io_uring: abolish old io_put_file() Pavel Begunkov
2021-03-04 18:52 ` [PATCH 07/11] io_uring: keep io_req_free_batch() call locality Pavel Begunkov
2021-03-04 18:52 ` [PATCH 08/11] io_uring: set req->work closer to all other fields Pavel Begunkov
2021-03-04 18:52 ` Pavel Begunkov [this message]
2021-03-04 18:52 ` [PATCH 10/11] io_uring: optimise success case of __io_queue_sqe Pavel Begunkov
2021-03-04 18:52 ` [PATCH 11/11] io_uring: refactor io_flush_cached_reqs() Pavel Begunkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=136531d2aacb68edbd43f5c06bf6a84b957e8be1.1614883424.git.asml.silence@gmail.com \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox