]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
io_uring/net: open code io_net_vec_assign()
authorPavel Begunkov <asml.silence@gmail.com>
Fri, 28 Mar 2025 23:10:55 +0000 (23:10 +0000)
committerJens Axboe <axboe@kernel.dk>
Fri, 28 Mar 2025 23:11:20 +0000 (17:11 -0600)
Get rid of io_net_vec_assign() by open coding it into its only caller.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/19191c34b5cfe1161f7eeefa6e785418ea9ad56d.1743202294.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_uring/net.c

index 34d103f2469d31f1eb34d062bc124a01ab9b2d12..68f87d7c74df6613c9c9218c92971fd46432a80b 100644 (file)
@@ -176,16 +176,6 @@ static struct io_async_msghdr *io_msg_alloc_async(struct io_kiocb *req)
        return hdr;
 }
 
-/* assign new iovec to kmsg, if we need to */
-static void io_net_vec_assign(struct io_kiocb *req, struct io_async_msghdr *kmsg,
-                            struct iovec *iov)
-{
-       if (iov) {
-               req->flags |= REQ_F_NEED_CLEANUP;
-               io_vec_reset_iovec(&kmsg->vec, iov, kmsg->msg.msg_iter.nr_segs);
-       }
-}
-
 static inline void io_mshot_prep_retry(struct io_kiocb *req,
                                       struct io_async_msghdr *kmsg)
 {
@@ -217,7 +207,11 @@ static int io_net_import_vec(struct io_kiocb *req, struct io_async_msghdr *iomsg
                             &iomsg->msg.msg_iter, io_is_compat(req->ctx));
        if (unlikely(ret < 0))
                return ret;
-       io_net_vec_assign(req, iomsg, iov);
+
+       if (iov) {
+               req->flags |= REQ_F_NEED_CLEANUP;
+               io_vec_reset_iovec(&iomsg->vec, iov, iomsg->msg.msg_iter.nr_segs);
+       }
        return 0;
 }