[PATCH v2 5/5] io_uring: remove io_prep_next_work()

Pavel Begunkov
2020-02-28T23:38:49Z

io-wq about IO_WQ_WORK_UNBOUND flag only while enqueueing, so it's
useless setting it for a next req of a link. Thet only useful thing
there is io_prep_linked_timeout(). Inline it.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
fs/io_uring.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index cefbae582b5f..b16cad7ebe40 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -999,17 +999,6 @@ static inline void io_req_work_drop_env(struct io_kiocb *req)
}
}

-static inline void io_prep_next_work(struct io_kiocb *req,
- struct io_kiocb **link)
-{
- const struct io_op_def *def = &io_op_defs[req->opcode];
-
- if (!(req->flags & REQ_F_ISREG) && def->unbound_nonreg_file)
- req->work.flags |= IO_WQ_WORK_UNBOUND;
-
- *link = io_prep_linked_timeout(req);
-}
-
static inline bool io_prep_async_work(struct io_kiocb *req,
struct io_kiocb **link)
{
@@ -6076,8 +6065,8 @@ static void io_wq_assign_next(struct io_wq_work **workptr, struct io_kiocb *req)
{
struct io_kiocb *link;

- io_prep_next_work(req, &link);
*workptr = &req->work;
+ link = io_prep_linked_timeout(req);
if (link) {
req->work.func = io_link_work_cb;
req->work.data = link;
--
2.24.0