* [PATCH 1/1] io_uring: remove io_prep_next_work()
@ 2020-02-29 19:48 Pavel Begunkov
2020-02-29 19:56 ` [PATCH v2] " Pavel Begunkov
0 siblings, 1 reply; 3+ messages in thread
From: Pavel Begunkov @ 2020-02-29 19:48 UTC (permalink / raw)
To: Jens Axboe, io-uring, linux-kernel
io-wq cares about IO_WQ_WORK_UNBOUND flag only while enqueueing, so
it's useless setting it for a next req of a link. Thus, removed it
from io_prep_linked_timeout(), and inline the function.
Signed-off-by: Pavel Begunkov <[email protected]>
---
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 74498c9cd023..9bbef21bad5b 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)
{
@@ -2581,8 +2570,8 @@ static void io_wq_assign_next(struct io_wq_work **workptr, struct io_kiocb *nxt)
{
struct io_kiocb *link;
- io_prep_next_work(nxt, &link);
*workptr = &nxt->work;
+ link = io_prep_linked_timeout(req);
if (link) {
nxt->work.func = io_link_work_cb;
nxt->work.data = link;
--
2.24.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2] io_uring: remove io_prep_next_work()
2020-02-29 19:48 [PATCH 1/1] io_uring: remove io_prep_next_work() Pavel Begunkov
@ 2020-02-29 19:56 ` Pavel Begunkov
2020-02-29 20:55 ` Jens Axboe
0 siblings, 1 reply; 3+ messages in thread
From: Pavel Begunkov @ 2020-02-29 19:56 UTC (permalink / raw)
To: Jens Axboe, io-uring, linux-kernel
io-wq cares about IO_WQ_WORK_UNBOUND flag only while enqueueing, so
it's useless setting it for a next req of a link. Thus, removed it
from io_prep_linked_timeout(), and inline the function.
Signed-off-by: Pavel Begunkov <[email protected]>
---
v2: fix unfortunate cherry-pick
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 74498c9cd023..768cf18cf912 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)
{
@@ -2581,8 +2570,8 @@ static void io_wq_assign_next(struct io_wq_work **workptr, struct io_kiocb *nxt)
{
struct io_kiocb *link;
- io_prep_next_work(nxt, &link);
*workptr = &nxt->work;
+ link = io_prep_linked_timeout(nxt);
if (link) {
nxt->work.func = io_link_work_cb;
nxt->work.data = link;
--
2.24.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] io_uring: remove io_prep_next_work()
2020-02-29 19:56 ` [PATCH v2] " Pavel Begunkov
@ 2020-02-29 20:55 ` Jens Axboe
0 siblings, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2020-02-29 20:55 UTC (permalink / raw)
To: Pavel Begunkov, io-uring, linux-kernel
On 2/29/20 12:56 PM, Pavel Begunkov wrote:
> io-wq cares about IO_WQ_WORK_UNBOUND flag only while enqueueing, so
> it's useless setting it for a next req of a link. Thus, removed it
> from io_prep_linked_timeout(), and inline the function.
Applied, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-29 20:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-29 19:48 [PATCH 1/1] io_uring: remove io_prep_next_work() Pavel Begunkov
2020-02-29 19:56 ` [PATCH v2] " Pavel Begunkov
2020-02-29 20:55 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox