From: Jens Axboe <[email protected]>
To: [email protected]
Cc: Jens Axboe <[email protected]>
Subject: [PATCH 01/10] io_uring: kill io_recv_buffer_select() wrapper
Date: Fri, 29 Apr 2022 06:27:54 -0600 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
It's just a thin wrapper around io_buffer_select(), get rid of it.
Signed-off-by: Jens Axboe <[email protected]>
---
fs/io_uring.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index dfebbf3a272a..12f61ce429dc 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -5897,14 +5897,6 @@ static int io_recvmsg_copy_hdr(struct io_kiocb *req,
return __io_recvmsg_copy_hdr(req, iomsg);
}
-static struct io_buffer *io_recv_buffer_select(struct io_kiocb *req,
- unsigned int issue_flags)
-{
- struct io_sr_msg *sr = &req->sr_msg;
-
- return io_buffer_select(req, &sr->len, sr->bgid, issue_flags);
-}
-
static int io_recvmsg_prep_async(struct io_kiocb *req)
{
int ret;
@@ -5961,7 +5953,7 @@ static int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags)
}
if (req->flags & REQ_F_BUFFER_SELECT) {
- kbuf = io_recv_buffer_select(req, issue_flags);
+ kbuf = io_buffer_select(req, &sr->len, sr->bgid, issue_flags);
if (IS_ERR(kbuf))
return PTR_ERR(kbuf);
kmsg->fast_iov[0].iov_base = u64_to_user_ptr(kbuf->addr);
@@ -6022,7 +6014,7 @@ static int io_recv(struct io_kiocb *req, unsigned int issue_flags)
return -ENOTSOCK;
if (req->flags & REQ_F_BUFFER_SELECT) {
- kbuf = io_recv_buffer_select(req, issue_flags);
+ kbuf = io_buffer_select(req, &sr->len, sr->bgid, issue_flags);
if (IS_ERR(kbuf))
return PTR_ERR(kbuf);
buf = u64_to_user_ptr(kbuf->addr);
--
2.35.1
next prev parent reply other threads:[~2022-04-29 12:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-29 12:27 [PATCHSET RFC 0/10] Add support for ring mapped provided buffers Jens Axboe
2022-04-29 12:27 ` Jens Axboe [this message]
2022-04-29 12:27 ` [PATCH 02/10] io_uring: make io_buffer_select() return the user address directly Jens Axboe
2022-04-29 12:27 ` [PATCH 03/10] io_uring: kill io_rw_buffer_select() wrapper Jens Axboe
2022-04-29 12:27 ` [PATCH 04/10] io_uring: always use req->buf_index for the provided buffer group Jens Axboe
2022-04-29 12:27 ` [PATCH 05/10] io_uring: cache last io_buffer_list lookup Jens Axboe
2022-04-29 12:27 ` [PATCH 06/10] io_uring: add buffer selection support to IORING_OP_NOP Jens Axboe
2022-04-29 12:28 ` [PATCH 07/10] io_uring: add io_pin_pages() helper Jens Axboe
2022-04-29 12:28 ` [PATCH 08/10] io_uring: abstract out provided buffer list selection Jens Axboe
2022-04-29 12:28 ` [PATCH 09/10] io_uring: relocate io_buffer_get_list() Jens Axboe
2022-04-29 12:28 ` [PATCH 10/10] io_uring: add support for ring mapped supplied buffers Jens Axboe
[not found] ` <CAM1kxwhyPpZFQ2ZEhWGdENz6Bw6a0QN-NWMkmAuYjVxDDHP_Aw@mail.gmail.com>
2022-04-29 14:57 ` 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 \
[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