io_uring: kill io_recv_buffer_select() wrapper
authorJens Axboe <axboe@kernel.dk>
Thu, 28 Apr 2022 19:36:50 +0000 (13:36 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 5 May 2022 23:15:15 +0000 (17:15 -0600)
It's just a thin wrapper around io_buffer_select(), get rid of it.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c

index 2d7190893a67bc0d6a3aa1616aa7473d47f617af..3dbf096f04255517aa7e4aca2feeec25a4c9e890 100644 (file)
@@ -5495,14 +5495,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;
@@ -5566,7 +5558,7 @@ static int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags)
                return io_setup_async_msg(req, kmsg);
 
        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);
@@ -5630,7 +5622,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);