public inbox for [email protected]
 help / color / mirror / Atom feed
From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH 11/12] io_uring: merge defer_prep() and prep_async()
Date: Sun, 28 Feb 2021 22:35:19 +0000	[thread overview]
Message-ID: <ca85c69810b09b134e0b097366b7fb1548fbd53c.1614551467.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>

Merge two function and do renaming in favour of the second one, it
relays the meaning better.

Signed-off-by: Pavel Begunkov <[email protected]>
---
 fs/io_uring.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index c9ab7ee5d500..0bdaf5105d11 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -5734,6 +5734,13 @@ static int io_req_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 
 static int io_req_prep_async(struct io_kiocb *req)
 {
+	if (!io_op_defs[req->opcode].needs_async_setup)
+		return 0;
+	if (WARN_ON_ONCE(req->async_data))
+		return -EFAULT;
+	if (io_alloc_async_data(req))
+		return -EAGAIN;
+
 	switch (req->opcode) {
 	case IORING_OP_READV:
 		return io_rw_prep_async(req, READ);
@@ -5746,18 +5753,9 @@ static int io_req_prep_async(struct io_kiocb *req)
 	case IORING_OP_CONNECT:
 		return io_connect_prep_async(req);
 	}
-	return 0;
-}
-
-static int io_req_defer_prep(struct io_kiocb *req)
-{
-	if (!io_op_defs[req->opcode].needs_async_setup)
-		return 0;
-	if (WARN_ON_ONCE(req->async_data))
-		return -EFAULT;
-	if (io_alloc_async_data(req))
-		return -EAGAIN;
-	return io_req_prep_async(req);
+	printk_once(KERN_WARNING "io_uring: prep_async() bad opcode %d\n",
+		    req->opcode);
+	return -EFAULT;
 }
 
 static u32 io_get_sequence(struct io_kiocb *req)
@@ -5790,7 +5788,7 @@ static int io_req_defer(struct io_kiocb *req)
 	if (!req_need_defer(req, seq) && list_empty_careful(&ctx->defer_list))
 		return 0;
 
-	ret = io_req_defer_prep(req);
+	ret = io_req_prep_async(req);
 	if (ret)
 		return ret;
 	io_prep_async_link(req);
@@ -6216,7 +6214,7 @@ static void io_queue_sqe(struct io_kiocb *req)
 			io_req_complete_failed(req, ret);
 		}
 	} else if (req->flags & REQ_F_FORCE_ASYNC) {
-		ret = io_req_defer_prep(req);
+		ret = io_req_prep_async(req);
 		if (unlikely(ret))
 			goto fail_req;
 		io_queue_async_work(req);
@@ -6362,7 +6360,7 @@ static int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
 			head->flags |= REQ_F_IO_DRAIN;
 			ctx->drain_next = 1;
 		}
-		ret = io_req_defer_prep(req);
+		ret = io_req_prep_async(req);
 		if (unlikely(ret))
 			goto fail_req;
 		trace_io_uring_link(ctx, req, head);
-- 
2.24.0


  parent reply	other threads:[~2021-02-28 22:40 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-28 22:35 [PATCH RESEND for-next 00/12] 5.13 first batch Pavel Begunkov
2021-02-28 22:35 ` [PATCH 01/12] io_uring: avoid taking ctx refs for task-cancel Pavel Begunkov
2021-02-28 22:35 ` [PATCH 02/12] io_uring: reuse io_req_task_queue_fail() Pavel Begunkov
2021-02-28 22:35 ` [PATCH 03/12] io_uring: further deduplicate file slot selection Pavel Begunkov
2021-02-28 22:35 ` [PATCH 04/12] io_uring: add a helper failing not issued requests Pavel Begunkov
2021-02-28 22:35 ` [PATCH 05/12] io_uring: refactor provide/remove buffer locking Pavel Begunkov
2021-02-28 22:35 ` [PATCH 06/12] io_uring: don't restirct issue_flags for io_openat Pavel Begunkov
2021-02-28 22:35 ` [PATCH 07/12] io_uring: use better types for cflags Pavel Begunkov
2021-02-28 22:35 ` [PATCH 08/12] io_uring: refactor out send/recv async setup Pavel Begunkov
2021-02-28 22:35 ` [PATCH 09/12] io_uring: untie alloc_async_data and needs_async_data Pavel Begunkov
2021-02-28 22:35 ` [PATCH 10/12] io_uring: rethink def->needs_async_data Pavel Begunkov
2021-02-28 22:35 ` Pavel Begunkov [this message]
2021-02-28 22:35 ` [PATCH 12/12] io_uring: simplify io_resubmit_prep() Pavel Begunkov
2021-03-01 23:53 ` [PATCH RESEND for-next 00/12] 5.13 first batch Jens Axboe

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=ca85c69810b09b134e0b097366b7fb1548fbd53c.1614551467.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